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

List:       kde-commits
Subject:    extragear/multimedia/amarok
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2009-07-10 13:47:55
Message-ID: 1247233675.443797.17560.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 994269 by alexmerry:

randomguy3 does housekeeping, part 1: remove audio CD code from 1.4.  nhnielsen's \
audio CD collection does it much more nicely anyway.



 M  +3 -0      ChangeLog  
 M  +0 -4      src/ActionClasses.cpp  
 M  +0 -24     src/App.cpp  
 M  +0 -10     src/EngineController.cpp  
 M  +0 -1      src/EngineController.h  
 M  +0 -23     src/MainWindow.cpp  
 M  +0 -1      src/MainWindow.h  
 M  +0 -1      src/Systray.cpp  
 M  +0 -5      src/scriptengine/AmarokEngineScript.cpp  
 M  +0 -1      src/scriptengine/AmarokEngineScript.h  


--- trunk/extragear/multimedia/amarok/ChangeLog #994268:994269
@@ -37,6 +37,9 @@
     * New navigation style in the browser sidebar.
     * Improvements to the Albums applet. Show individual track times and
       highlight currently playing artist within compilation albums
+    * Removed PlayAudioCD from the scripting interface.  It never worked
+      anyway, and audio CDs are just treated as a collection and not a
+      special case like they were in 1.4.
 
   BUGFIXES:
     * Fixed local playlists being renamed to blank when user hits cancel
--- trunk/extragear/multimedia/amarok/src/ActionClasses.cpp #994268:994269
@@ -100,10 +100,6 @@
     addSeparator();
 
     safePlug( ac, "playlist_playmedia", this );
-#if 0
-    // Audio CD is not currently supported
-    safePlug( ac, "play_audiocd", this );
-#endif
 
     addSeparator();
 
--- trunk/extragear/multimedia/amarok/src/App.cpp #994268:994269
@@ -363,23 +363,6 @@
         haveArgs = true;
         The::playlistActions()->back();
     }
-    /*
-    else if (args->isSet("cdplay"))
-    {
-        haveArgs = true;
-        QString device = args->getOption("cdplay");
-        KUrl::List urls;
-        if (The::engineController()->getAudioCDContents(device, urls))
-        {
-            Meta::TrackList tracks = CollectionManager::instance()->tracksForUrls( \
                urls );
-            The::playlistController()->insertOptioned( tracks, \
                Playlist::Replace|Playlist::DirectPlay );
-        }
-        else
-        { // Default behaviour
-            debug() << "Sorry, the engine does not support direct play from \
                AudioCD...";
-        }
-    }
-    */
 
     static bool firstTime = true;
     const bool debugWasJustEnabled = !Amarok::config().readEntry( "Debug Enabled", \
false ) && args->isSet( "debug" ); @@ -456,7 +439,6 @@
     options.add("m");
     options.add("multipleinstances", ki18n("Allow running multiple Amarok \
                instances"));
     options.add("cwd <directory>", ki18n( "Base for relative filenames/URLs" ));
-    //options.add("cdplay <device>", ki18n("Play an AudioCD from <device> or \
system:/media/<device>"));  
     KCmdLineArgs::addCmdLineOptions( options );   //add our own options
 }
@@ -548,12 +530,6 @@
 
         if( The::engineController()->isMuted() != AmarokConfig::muteState() )
             The::engineController()->setMuted( AmarokConfig::muteState() );
-
-#if 0
-    // Audio CD is not currently supported
-    Amarok::actionCollection()->action( "play_audiocd" )->setEnabled( false );
-#endif
-
     } //</Engine>
 
     {   // delete unneeded cover images from cache
--- trunk/extragear/multimedia/amarok/src/EngineController.cpp #994268:994269
@@ -625,17 +625,7 @@
     }
 }
 
-
 bool
-EngineController::getAudioCDContents(const QString &device, KUrl::List &urls)
-{
-    Q_UNUSED( device ); Q_UNUSED( urls );
-//since Phonon doesn't know anything about CD listings, there's actually no reason \
                for this functionality to be here
-//kept to keep things compiling, probably should be in its own class.
-    return false;
-}
-
-bool
 EngineController::isStream()
 {
     DEBUG_BLOCK
--- trunk/extragear/multimedia/amarok/src/EngineController.h #994268:994269
@@ -89,7 +89,6 @@
     bool isMuted() const;
     bool isPaused() const;
     bool loaded() { return phononMediaObject()->state() != Phonon::StoppedState; }
-    bool getAudioCDContents(const QString &device, KUrl::List &urls);
     bool isStream();
     enum PlayerStatus
     {
--- trunk/extragear/multimedia/amarok/src/MainWindow.cpp #994268:994269
@@ -543,22 +543,6 @@
 }
 
 void
-MainWindow::playAudioCD() //SLOT
-{
-    KUrl::List urls;
-    if( The::engineController()->getAudioCDContents(QString(), urls) )
-    {
-        Meta::TrackList tracks = CollectionManager::instance()->tracksForUrls( urls \
                );
-        if( !tracks.isEmpty() )
-            The::playlistController()->insertOptioned( tracks, Playlist::Replace );
-    }
-    else
-    { // Default behaviour
-        showBrowser( "FileBrowser" );
-    }
-}
-
-void
 MainWindow::showScriptSelector() //SLOT
 {
     ScriptManager::instance()->show();
@@ -663,13 +647,6 @@
     connect(action, SIGNAL(triggered(bool)), SLOT(slotPlayMedia()));
     ac->addAction( "playlist_playmedia", action );
 
-#if 0
-    // Audio CD is not currently supported
-    action = new KAction( KIcon( "media-optical-audio-amarok" ), i18n("Play Audio \
                CD"), this );
-    connect(action, SIGNAL(triggered(bool)), SLOT(playAudioCD()));
-    ac->addAction( "play_audiocd", action );
-#endif
-
     action = new KAction( KIcon("preferences-plugin-script-amarok"), i18n("Script \
Manager"), this );  connect(action, SIGNAL(triggered(bool)), \
SLOT(showScriptSelector()));  ac->addAction( "script_manager", action );
--- trunk/extragear/multimedia/amarok/src/MainWindow.h #994268:994269
@@ -111,7 +111,6 @@
     public slots:
         void showHide();
         void loveTrack();
-        void playAudioCD();
         void hideContextView( bool hide );
 
         void setLayoutLocked( bool locked );
--- trunk/extragear/multimedia/amarok/src/Systray.cpp #994268:994269
@@ -85,7 +85,6 @@
     extern void qt_mac_set_dock_menu(QMenu *);
     qt_mac_set_dock_menu( contextMenu() );
     contextMenu()->addAction( ac->action( "playlist_playmedia" ) );
-    contextMenu()->addAction( ac->action( "play_audiocd" ) );
     contextMenu()->addSeparator();
     #endif
 
--- trunk/extragear/multimedia/amarok/src/scriptengine/AmarokEngineScript.cpp \
#994268:994269 @@ -72,11 +72,6 @@
         The::engineController()->playPause();
     }
 
-    void AmarokEngineScript::PlayAudioCD() const
-    {
-        The::mainWindow()->playAudioCD();
-    }
-
     void AmarokEngineScript::Seek( int ms ) const
     {
         The::engineController()->seek( ms );
--- trunk/extragear/multimedia/amarok/src/scriptengine/AmarokEngineScript.h \
#994268:994269 @@ -46,7 +46,6 @@
             void Next() const;
             void Prev() const;
             void PlayPause() const;
-            void PlayAudioCD() const;
             void Seek( int ms ) const;
             void SeekRelative( int ms ) const;
             void SeekForward( int ms = 10000 ) const;


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