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

List:       kde-commits
Subject:    kdeextragear-1/amarok
From:       Mark Kretschmann <markey () web ! de>
Date:       2004-10-01 7:05:32
Message-ID: 20041001070532.AD588996F () office ! kde ! org
[Download RAW message or body]

CVS commit by markey: 

FIX: With "Title Streaming" disabled GStreamer could not play streams.

Now the StreamProvider is always used (except when the engine specifies \
"NoStreaming", like xine does), but the metadata is not shown when the option is \
disabled.

CCMAIL: amarok-devel@lists.sf.net


  M +1 -0      ChangeLog   1.345
  M +2 -6      TODO   1.508
  M +8 -8      src/enginecontroller.cpp   1.83
  M +1 -1      src/enginecontroller.h   1.35


--- kdeextragear-1/amarok/ChangeLog  #1.344:1.345
@@ -5,4 +5,5 @@
 
 VERSION 1.1.1:
+  FIX: With "Title Streaming" disabled GStreamer could not play streams.
   FIX: Osssink is now the default sink for GStreamer. If sink initialization
        fails, a dialog will ask to select another sink.

--- kdeextragear-1/amarok/TODO  #1.507:1.508
@@ -11,6 +11,4 @@
           <mxcl>   With one track in pls and repeat and random mode on, amaroK \
crashes at track end.  
-          <mxcl>   You can't stream with gstreamer unless title-streaming is \
                enabled.
-
   ADD     <markey> We must add a FAQ about dmix software mixing and its setup. \
                "amaroK blocks the sound
                    device" is one of the top user complaints. This FAQ should be put \
into a promiment @@ -22,6 +20,4 @@
                    up old versions could be on our side.
 
-          <mxcl>   Context Browser doesn't update images when you fetch them using \
                the Cover Manager.
-
           <markey> LibVisual windows are missing a caption with the current plugin \
name.  
@@ -32,6 +28,4 @@
   ADD 180 <muesli> Show "Artist - Song" for Various Artist folder.
 
-  FIX 162 <markey> Try to achieve Qt 3.2 compatibility for amaroK 1.1.
-
   FIX 161 <markey> Configure prints "Good - your configure finished. Start make now" \
even when amaroK  will _not_ be built. Confusing..
@@ -44,4 +38,6 @@
 MID-TERM:
 
+          <mxcl>   Context Browser doesn't update images when you fetch them using \
the Cover Manager. +
   CHG     <markey> Make CollectionDB a singleton. Why do we create a fucking object \
                for each db access?
                    This SUCKS. Also, you can't connect to CollectionDB signals \
currently, cause there are

--- kdeextragear-1/amarok/src/enginecontroller.cpp  #1.82:1.83
@@ -383,7 +383,5 @@ void EngineController::playRemote( KIO::
     StatusBar::instance()->clear();
 
-    if ( isStream &&
-         AmarokConfig::titleStreaming() &&
-         m_engine->streamingMode() != Engine::NoStreaming )
+    if ( isStream && m_engine->streamingMode() != Engine::NoStreaming )
     {
         m_stream = new amaroK::StreamProvider( url, m_engine->streamingMode() );
@@ -397,5 +395,5 @@ void EngineController::playRemote( KIO::
 
         connect( m_stream, SIGNAL(metaData( const MetaBundle& )),
-                 this,       SLOT(slotNewMetaData( const MetaBundle& )) );
+                 this,       SLOT(slotStreamMetaData( const MetaBundle& )) );
         connect( m_stream, SIGNAL(streamData( char*, int )),
                  m_engine,   SLOT(newStreamData( char*, int )) );
@@ -412,9 +410,11 @@ void EngineController::playRemote( KIO::
 }
 
-void EngineController::slotNewMetaData( const MetaBundle &bundle ) //SLOT
+void EngineController::slotStreamMetaData( const MetaBundle &bundle ) //SLOT
 {
+    if ( AmarokConfig::titleStreaming() )
+    {
     m_bundle = bundle;
-
     newMetaDataNotify( bundle, false /* not a new track */ );
+    }
 }
 

--- kdeextragear-1/amarok/src/enginecontroller.h  #1.34:1.35
@@ -86,5 +86,5 @@ signals:
 private slots:
     void playRemote( KIO::Job* );
-    void slotNewMetaData( const MetaBundle& );
+    void slotStreamMetaData( const MetaBundle& );
     void slotMainTimer();
     void slotTrackEnded();


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