From c582445a27e3965940a3297aeb45ac4c7578626a Mon Sep 17 00:00:00 2001 From: nhnielsen Date: Mon, 15 Oct 2007 07:11:38 +0000 Subject: [PATCH] Disable lots of MediaDevicePlugin stuff to get Amarok to build and run. Also disable a bit of plasma stuff thats currently broken git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/extragear/multimedia/amarok@725363 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/CMakeLists.txt | 2 +- src/MediaDevice.cpp | 2 +- src/MediaDevicePluginManager.h | 3 ++- src/actionclasses.cpp | 2 +- src/configdialog/ConfigDialog.cpp | 4 ++-- src/configdialog/dialogs/MediadeviceConfig.cpp | 2 +- src/context/containments/ColumnApplet.cpp | 8 ++++---- src/mediabrowser.cpp | 2 +- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 906bf2809..f3c8ff09e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -173,7 +173,7 @@ set(libconfigdialog_SRCS configdialog/dialogs/EngineConfig.cpp configdialog/dialogs/GeneralConfig.cpp configdialog/dialogs/LastfmConfig.cpp - configdialog/dialogs/MediadeviceConfig.cpp + #configdialog/dialogs/MediadeviceConfig.cpp configdialog/dialogs/OsdConfig.cpp configdialog/dialogs/PlaybackConfig.cpp ) diff --git a/src/MediaDevice.cpp b/src/MediaDevice.cpp index 83c477191..47256bf13 100644 --- a/src/MediaDevice.cpp +++ b/src/MediaDevice.cpp @@ -17,7 +17,7 @@ #include "debug.h" #include "mediabrowser.h" #include "MediaItem.h" -#include "mediumpluginmanager.h" +//#include "mediumpluginmanager.h" #include "metabundle.h" #include "mountpointmanager.h" #include "pluginmanager.h" diff --git a/src/MediaDevicePluginManager.h b/src/MediaDevicePluginManager.h index a57e05683..8c8024bb9 100644 --- a/src/MediaDevicePluginManager.h +++ b/src/MediaDevicePluginManager.h @@ -16,6 +16,7 @@ #include "hintlineedit.h" #include "plugin/pluginconfig.h" + #include #include #include @@ -50,7 +51,7 @@ class MediaDeviceConfig : public KHBox ~MediaDeviceConfig(); QString oldPlugin() { return m_oldPlugin; } void setOldPlugin( const QString &oldPlugin ) { m_oldPlugin = oldPlugin; } - inline QString plugin() { return MediaBrowser::instance()->getInternalPluginName( m_pluginCombo->currentText() ); } + inline QString plugin() { return MediaDevicePluginManager::instance()->getInternalPluginName( m_pluginCombo->currentText() ); } KComboBox *pluginCombo() { return m_pluginCombo; } QAbstractButton *configButton() { return m_configButton; } QAbstractButton *removeButton() { return m_removeButton; } diff --git a/src/actionclasses.cpp b/src/actionclasses.cpp index 6278031b7..a5e0af503 100644 --- a/src/actionclasses.cpp +++ b/src/actionclasses.cpp @@ -14,7 +14,7 @@ #include "enginecontroller.h" #include "k3bexporter.h" #include "MainWindow.h" -#include "mediumpluginmanager.h" +//#include "mediumpluginmanager.h" #include "socketserver.h" //Vis::Selector::showInstance() #include "statusbar.h" diff --git a/src/configdialog/ConfigDialog.cpp b/src/configdialog/ConfigDialog.cpp index 2ac711254..6f501d82f 100644 --- a/src/configdialog/ConfigDialog.cpp +++ b/src/configdialog/ConfigDialog.cpp @@ -50,7 +50,7 @@ Amarok2ConfigDialog::Amarok2ConfigDialog( QWidget *parent, const char* name, KCo ConfigDialogBase* engine = new EngineConfig( this ); ConfigDialogBase* general = new GeneralConfig( this ); ConfigDialogBase* lastfm = new LastfmConfig( this ); - ConfigDialogBase* mediadevice = new MediadeviceConfig( this ); + //ConfigDialogBase* mediadevice = new MediadeviceConfig( this ); ConfigDialogBase* osd = new OsdConfig( this ); ConfigDialogBase* playback = new PlaybackConfig( this ); @@ -61,7 +61,7 @@ Amarok2ConfigDialog::Amarok2ConfigDialog( QWidget *parent, const char* name, KCo addPage( osd, i18n( "OSD" ), Amarok::icon( "settings_indicator" ), i18n( "Configure On-Screen-Display" ) ); addPage( lastfm, i18n( "last.fm" ), Amarok::icon( "audioscrobbler" ), i18n( "Configure last.fm Support" ) ); addPage( collection, i18n( "Collection" ), Amarok::icon( "collection" ), i18n( "Configure Collection" ) ); - addPage( mediadevice, i18n( "Media Devices" ), Amarok::icon( "device" ), i18n( "Configure Portable Player Support" ) ); + //addPage( mediadevice, i18n( "Media Devices" ), Amarok::icon( "device" ), i18n( "Configure Portable Player Support" ) ); setButtons( Help | Ok | Apply | Cancel ); } diff --git a/src/configdialog/dialogs/MediadeviceConfig.cpp b/src/configdialog/dialogs/MediadeviceConfig.cpp index a9e6e4625..7355b6acc 100644 --- a/src/configdialog/dialogs/MediadeviceConfig.cpp +++ b/src/configdialog/dialogs/MediadeviceConfig.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ #include "MediadeviceConfig.h" -#include "mediumpluginmanager.h" +#include "MediaDevicePluginManager.h" #include #include diff --git a/src/context/containments/ColumnApplet.cpp b/src/context/containments/ColumnApplet.cpp index 831acbb5f..0af0e515e 100644 --- a/src/context/containments/ColumnApplet.cpp +++ b/src/context/containments/ColumnApplet.cpp @@ -32,7 +32,7 @@ ColumnApplet::ColumnApplet( QObject *parent, const QVariantList &args ) { DEBUG_BLOCK m_columns = new Plasma::FlowLayout( this ); - m_columns->setColumnWidth( m_defaultColumnSize ); + // m_columns->setColumnWidth( m_defaultColumnSize ); m_background = new Svg( "widgets/amarok-wallpaper", this ); m_logo = new Svg( "widgets/amarok-logo", this ); @@ -43,9 +43,9 @@ ColumnApplet::ColumnApplet( QObject *parent, const QVariantList &args ) m_appletBrowserAction = new QAction(i18n("Add applet"), this); connect(m_appletBrowserAction, SIGNAL(triggered(bool)), this, SLOT(launchAppletBrowser())); - m_appletBrowser = new Plasma::AppletBrowser( this, "amarok" ); - m_appletBrowser->setParentApp( "amarok" ); - m_appletBrowser->hide(); +// m_appletBrowser = new Plasma::AppletBrowser( this, "amarok" ); +// m_appletBrowser->setParentApp( "amarok" ); + // m_appletBrowser->hide(); } // fetches size from scene and creates columns according. diff --git a/src/mediabrowser.cpp b/src/mediabrowser.cpp index cec5d7cf0..aa403762a 100644 --- a/src/mediabrowser.cpp +++ b/src/mediabrowser.cpp @@ -25,7 +25,7 @@ #include "MediaDevice.h" #include "MediaDeviceCache.h" #include "medium.h" -#include "mediumpluginmanager.h" +//#include "mediumpluginmanager.h" #include "metabundle.h" #include "mountpointmanager.h" #include "playlist/PlaylistModel.h" -- 2.11.4.GIT