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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/mediadevice/mtp
From:       Jeff Mitchell <kde-dev () emailgoeshere ! com>
Date:       2007-09-13 20:20:19
Message-ID: 1189714819.627349.8216.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 712181 by mitchell:

Get rid of some linking errors


 M  +6 -13     CMakeLists.txt  
 M  +36 -36    mtpmediadevice.h  


--- trunk/extragear/multimedia/amarok/src/mediadevice/mtp/CMakeLists.txt \
#712180:712181 @@ -4,26 +4,19 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/../../amarokcore
     ${CMAKE_CURRENT_SOURCE_DIR}/../../engine
     ${CMAKE_CURRENT_SOURCE_DIR}/../../mediadevice
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../meta
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../collection
     ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
 
 
 ########### next target ###############
 
-if(MTP_FOUND)
-    ADD_DEFINITIONS(-DHAVE_MTP)
-    set( mtp_SRCS
-        mtp_backend/pmpkioslave_mtpbackend.cpp
-    )
-    set( mtp_LIBS
-        mtp
-    )
-else(MTP_FOUND)
-    set( mtp_SRCS )
-    set( mtp_LIBS )
-endif(MTP_FOUND)
+ADD_DEFINITIONS(-DHAVE_MTP)
+set( mtp_LIBS
+    mtp
+)
 
 set(amarok_mtp-mediadevice_PART_SRCS
-    ${mtp_SRCS}
     ${CMAKE_CURRENT_SOURCE_DIR}/mtpmediadevice.cpp )
 
 kde4_add_plugin(amarok_mtp-mediadevice WITH_PREFIX \
                ${amarok_mtp-mediadevice_PART_SRCS})
--- trunk/extragear/multimedia/amarok/src/mediadevice/mtp/mtpmediadevice.h \
#712180:712181 @@ -89,40 +89,40 @@
         QString                 m_album;
 };
 
-class MtpMediaItem : public MediaItem
-{
-    public:
-        explicit MtpMediaItem( Q3ListView *parent, Q3ListViewItem *after = 0 )
-            : MediaItem( parent, after ) {}
-        explicit MtpMediaItem( Q3ListViewItem *parent, Q3ListViewItem *after = 0 )
-            : MediaItem( parent, after ) {}
-        MtpMediaItem( Q3ListView *parent, MediaDevice *dev )
-            : MediaItem( parent ) { init( dev ); }
-        MtpMediaItem( Q3ListViewItem *parent, MediaDevice *dev )
-            : MediaItem( parent ) { init( dev ); }
+// class MtpMediaItem : public MediaItem
+// {
+//     public:
+//         explicit MtpMediaItem( Q3ListView *parent, Q3ListViewItem *after = 0 )
+//             : MediaItem( parent, after ) {}
+//         explicit MtpMediaItem( Q3ListViewItem *parent, Q3ListViewItem *after = 0 \
) +//             : MediaItem( parent, after ) {}
+//         MtpMediaItem( Q3ListView *parent, MediaDevice *dev )
+//             : MediaItem( parent ) { init( dev ); }
+//         MtpMediaItem( Q3ListViewItem *parent, MediaDevice *dev )
+//             : MediaItem( parent ) { init( dev ); }
+// 
+//         void init( MediaDevice *dev )
+//         {
+//             m_track  = 0;
+//             m_playlist = 0;
+//             m_device = dev;
+//         }
+// 
+//         ~MtpMediaItem()
+//         {
+//             //m_track->removeItem(this);
+//         }
+//         void                setTrack( MtpMediaDeviceTrack *track ) { m_track = \
track; } +//         MtpMediaDeviceTrack            *track() { return m_track; }
+//         void                setPlaylist( MtpPlaylist *playlist ) { m_playlist = \
playlist; } +//         MtpPlaylist         *playlist() { return m_playlist; }
+//         QString             filename() { return KUrl( m_track->url() ).path(); }
+// 
+//     private:
+//         MtpMediaDeviceTrack     *m_track;
+//         MtpPlaylist             *m_playlist;
+// };
 
-        void init( MediaDevice *dev )
-        {
-            m_track  = 0;
-            m_playlist = 0;
-            m_device = dev;
-        }
-
-        ~MtpMediaItem()
-        {
-            //m_track->removeItem(this);
-        }
-        void                setTrack( MtpMediaDeviceTrack *track ) { m_track = \
                track; }
-        MtpMediaDeviceTrack            *track() { return m_track; }
-        void                setPlaylist( MtpPlaylist *playlist ) { m_playlist = \
                playlist; }
-        MtpPlaylist         *playlist() { return m_playlist; }
-        QString             filename() { return KUrl( m_track->url() ).path(); }
-
-    private:
-        MtpMediaDeviceTrack     *m_track;
-        MtpPlaylist             *m_playlist;
-};
-
 class MtpMediaDevice : public MediaDevice
 {
     Q_OBJECT
@@ -134,7 +134,7 @@
         bool                    isConnected();
         LIBMTP_mtpdevice_t      *current_device();
         void                    setDisconnected();
-        virtual void            rmbPressed( Q3ListViewItem *qitem, const QPoint \
&point, int arg1 ); +        virtual void            rmbPressed( Q3ListViewItem \
*qitem, const QPoint &point, int arg1 ) {};  virtual void            init( \
MediaBrowser* parent );  virtual QStringList     supportedFiletypes();
         void                    setFolders( LIBMTP_folder_t *folders );
@@ -159,8 +159,8 @@
 
         void                    synchronizeDevice();
         int                     deleteItemFromDevice( MediaItem *mediaitem, int \
                flags=DeleteTrack );
-        void                    addToPlaylist( MediaItem *list, MediaItem *after, \
                Q3PtrList<MediaItem> items );
-        MtpMediaItem            *newPlaylist( const QString &name, MediaItem *list, \
Q3PtrList<MediaItem> items ); +        //void                    addToPlaylist( \
MediaItem *list, MediaItem *after, Q3PtrList<MediaItem> items ); +        \
//MtpMediaItem            *newPlaylist( const QString &name, MediaItem *list, \
                Q3PtrList<MediaItem> items );
         bool                    getCapacity( KIO::filesize_t *total, KIO::filesize_t \
*available );  virtual void            updateRootItems() {};
 


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