From 2a9478e4ce5f9e374587e1c88730faf190d79ffc Mon Sep 17 00:00:00 2001
From: Scott Wheeler <wheeler@kde.org>
Date: Wed, 25 Feb 2004 01:35:31 +0000
Subject: [PATCH] More updates getting this ready to sneek into usage...

svn path=/trunk/kdemultimedia/juk/; revision=291176
---
 playermanager.cpp | 46 +++++++++++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/playermanager.cpp b/playermanager.cpp
index 04e71e3e..a32e6b15 100644
--- a/playermanager.cpp
+++ b/playermanager.cpp
@@ -62,26 +62,33 @@ void PlayerManager::play(const QString &fileName)
     if(!m_player)
         return;
 
-    if(m_player->paused())
-        m_player->stop();
-
-    m_player->play(fileName);
+    if(fileName.isNull()) {
+	if(m_player->paused())
+            m_player->play();
+        if(m_player->playing())
+            m_player->seekPosition(0);
+    }
+    else {
+        if(m_player->paused())
+            m_player->stop();
+        m_player->play(fileName);
+    }
 
     // Make sure that the m_player actually starts before doing anything.
 
-    if(m_player->playing()) {
+    if(!m_player->playing()) {
+        stop();
+        return;
+    }
 
-        m_actionCollection->action("pause")->setEnabled(true);
-        m_actionCollection->action("stop")->setEnabled(true);
-        m_actionCollection->action("forward")->setEnabled(true);
-        m_actionCollection->action("back")->setEnabled(true);
+    m_actionCollection->action("pause")->setEnabled(true);
+    m_actionCollection->action("stop")->setEnabled(true);
+    m_actionCollection->action("forward")->setEnabled(true);
+    m_actionCollection->action("back")->setEnabled(true);
 
-        m_sliderAction->trackPositionSlider()->setValue(0);
-        m_sliderAction->trackPositionSlider()->setEnabled(true);
-        // m_playTimer->start(m_pollInterval);
-    }
-    else
-        stop();
+    m_sliderAction->trackPositionSlider()->setValue(0);
+    m_sliderAction->trackPositionSlider()->setEnabled(true);
+    // m_playTimer->start(m_pollInterval);
 }
 
 void PlayerManager::pause()
@@ -215,6 +222,15 @@ void PlayerManager::setup()
     m_actionCollection->action("forward")->setEnabled(false);
 
     m_sliderAction = static_cast<SliderAction *>(m_actionCollection->action("trackPositionAction"));
+
+    KAction *outputAction = m_actionCollection->action("outputSelect");
+
+    if(outputAction) {
+        int mediaSystem = static_cast<KSelectAction *>(outputAction)->currentItem();
+        m_player = Player::createPlayer(mediaSystem);
+    }
+    else
+        m_player = Player::createPlayer();
 }
 
 #include "playermanager.moc"
-- 
GitLab