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

List:       kde-commits
Subject:    kdeextragear-1/amarok/amarok
From:       Max Howell <max.howell () methylblue ! com>
Date:       2004-03-01 1:17:18
Message-ID: 20040301011718.12BE9995A () office ! kde ! org
[Download RAW message or body]

CVS commit by mhowell: 

* disable playlistBrowser and don't compile code in preperation for 0.9-final
* Fix a crash bug for deleting the track you set to play next with the context menu


  M +3 -3      browserwin.cpp   1.83
  M +4 -0      playlistbrowser.cpp   1.5
  M +4 -2      playlistwidget.cpp   1.127


--- kdeextragear-1/amarok/amarok/browserwin.cpp  #1.82:1.83
@@ -408,5 +408,5 @@ BrowserWin::BrowserWin( QWidget *parent,
 
     //</PlaylistBrowser>
-        m_sideBar->addPage( m_playlist->browser(), i18n( "Playlist Browser" ), "midi" );
+    //    m_sideBar->addPage( m_playlist->browser(), i18n( "Playlist Browser" ), "midi" );
     //</PlaylistBrowser>
 

--- kdeextragear-1/amarok/amarok/playlistbrowser.cpp  #1.4:1.5
@@ -2,4 +2,6 @@
 // See COPYING file for licensing information
 
+#if 0
+
 #include "playlistbrowser.h"
 #include "metabundle.h"   //prettyLength()
@@ -146,2 +148,4 @@ PlaylistBrowser::findCoverArt( const KUR
 
 #include "playlistbrowser.moc"
+
+#endif
\ No newline at end of file

--- kdeextragear-1/amarok/amarok/playlistwidget.cpp  #1.126:1.127
@@ -50,5 +50,5 @@
 PlaylistWidget::PlaylistWidget( QWidget *parent, /*KActionCollection *ac,*/ const char *name )
     : KListView( parent, name )
-    , m_browser( new PlaylistBrowser( "PlaylistBrowser" ) )
+    , m_browser( /*new PlaylistBrowser( "PlaylistBrowser" )*/ 0 )
     , m_GlowTimer( new QTimer( this ) )
     , m_GlowCount( 100 )
@@ -462,4 +462,6 @@ void PlaylistWidget::removeSelectedItems
                     tmp->setSelected( true );
         }
+        else if( m_nextTrack == item ) m_nextTrack = 0;
+        else if( m_cachedTrack == item ) m_cachedTrack = 0;
 
         //keep search system and recent buffer synchronised
@@ -532,5 +534,5 @@ void PlaylistWidget::activate( QListView
 {
     //lets ask the engine to play something
-    if( PlaylistItem* playItem = static_cast<PlaylistItem*>( item ) )
+    if( PlaylistItem* const playItem = static_cast<PlaylistItem*>( item ) )
     {
         kdDebug() << "[playlist] Requesting playback for: " << item->text( 0 ) << endl;


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