[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdemultimedia/noatun
From:       Charles Samuels <charles () kde ! org>
Date:       2004-01-24 15:47:52
Message-ID: 20040124154752.A5AF526C8 () office ! kde ! org
[Download RAW message or body]

CVS commit by charles: 

it appears that if SM starts noatun, it tends to always play immediately no matter what.
at least with SPL and Flex


  M +0 -1      library/app.cpp   1.30
  M +4 -13     modules/marquis/marquis.cpp   1.14


--- kdemultimedia/noatun/library/app.cpp  #1.29:1.30
@@ -106,5 +106,4 @@ NoatunApp::NoatunApp()
         if(isRestored())
         {
-                mPlayer->engine()->setInitialized();
                 mLibraryLoader->add("marquis.plugin");
                 static_cast<SessionManagement*>(mLibraryLoader->plugins().first())->restore();

--- kdemultimedia/noatun/modules/marquis/marquis.cpp  #1.13:1.14
@@ -35,4 +35,5 @@
 #include "marquis.h"
 #include <noatun/player.h>
+#include <noatun/engine.h>
 #include <kaction.h>
 
@@ -168,17 +169,7 @@ void Marquis::readSessionConfig(KConfig 
                 napp->playlist()->showList();
 
-// this is broken (pfeiffer)
-/*
-        KURL songURL = c->readPathEntry("Current Song");
-        kdDebug(66666) << "song: " << songURL.url() << endl;
-        if ( songURL.isValid() )
-        {
-                kdDebug(66666) << "is Valid, setting as current now!" << endl;
-                napp->playlist()->addFile( songURL, true );
-                int position = c->readNumEntry("Current Position", 0);
-                player->skipTo( position );
-                setPlayStatus( player, c->readNumEntry("PlayStatus", 0) );
-        }
-*/
+        player->setVolume( c->readNumEntry("Volume", 100) );
+        napp->player()->engine()->setInitialized();
+        // TODO: restore the playback state (also save it ;)
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]