enabled most general plugins

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3576 90c681e8-e032-0410-971d-27865f9a5e38

10 files changed, 54 insertions, 54 deletions

diff --git a/src/plugins/General/General.pro b/src/plugins/General/General.pro
index 85a7bca6b..f24c01ff0 100644
--- a/src/plugins/General/General.pro
+++ b/src/plugins/General/General.pro
@@ -15,15 +15,15 @@ unix:SUBDIRS += mpris \
                 converter
 
 contains(CONFIG, UDISKS_PLUGIN){
-    unix:SUBDIRS += udisks
+#    unix:SUBDIRS += udisks
 }
 
 contains(CONFIG, UDISKS2_PLUGIN){
-    unix:SUBDIRS += udisks2
+#    unix:SUBDIRS += udisks2
 }
 
 contains(CONFIG, HAL_PLUGIN){
-    unix:SUBDIRS += hal
+#    unix:SUBDIRS += hal
 }
 
 TEMPLATE = subdirs
diff --git a/src/plugins/General/converter/converterhelper.cpp b/src/plugins/General/converter/converterhelper.cpp
index 0a93990c6..2d7d92936 100644
--- a/src/plugins/General/converter/converterhelper.cpp
+++ b/src/plugins/General/converter/converterhelper.cpp
@@ -55,11 +55,11 @@ ConverterHelper::~ConverterHelper()
 void ConverterHelper::openConverter()
 {
     PlayListManager *pl_manager = MediaPlayer::instance()->playListManager();
-    QList <PlayListTrack *> items = pl_manager->selectedPlayList()->selectedItems();
-    if (items.isEmpty())
+    QList <PlayListTrack *> tracks = pl_manager->selectedPlayList()->selectedTracks();
+    if (tracks.isEmpty())
         return;
 
-    ConverterDialog *d = new ConverterDialog(items, qApp->activeWindow ());
+    ConverterDialog *d = new ConverterDialog(tracks, qApp->activeWindow ());
     if(d->exec() == QDialog::Accepted)
     {
         QStringList urls = d->selectedUrls();
diff --git a/src/plugins/General/copypaste/copypaste.cpp b/src/plugins/General/copypaste/copypaste.cpp
index 2d9576187..17d17ba71 100644
--- a/src/plugins/General/copypaste/copypaste.cpp
+++ b/src/plugins/General/copypaste/copypaste.cpp
@@ -66,9 +66,9 @@ void CopyPaste::cut()
     qDebug("%s", Q_FUNC_INFO);
     qDeleteAll(m_buffer);
     m_buffer.clear();
-    foreach(PlayListTrack *item,  m_pl_manager->selectedPlayList()->selectedItems())
+    foreach(PlayListTrack *track,  m_pl_manager->selectedPlayList()->selectedTracks())
     {
-        m_buffer.append(new PlayListTrack(*item));
+        m_buffer.append(new PlayListTrack(*track));
     }
     m_pl_manager->selectedPlayList()->removeSelected();
 }
@@ -78,17 +78,17 @@ void CopyPaste::copy()
     qDebug("%s", Q_FUNC_INFO);
     qDeleteAll(m_buffer);
     m_buffer.clear();
-    foreach(PlayListTrack *item,  m_pl_manager->selectedPlayList()->selectedItems())
+    foreach(PlayListTrack *track,  m_pl_manager->selectedPlayList()->selectedTracks())
     {
-        m_buffer.append(new PlayListTrack(*item));
+        m_buffer.append(new PlayListTrack(*track));
     }
 }
 
 void CopyPaste::paste()
 {
     qDebug("%s", Q_FUNC_INFO);
-    foreach(PlayListTrack *item,  m_buffer)
+    foreach(PlayListTrack *track,  m_buffer)
     {
-        m_pl_manager->selectedPlayList()->add(new PlayListTrack(*item));
+        m_pl_manager->selectedPlayList()->add(new PlayListTrack(*track));
     }
 }
diff --git a/src/plugins/General/covermanager/covermanager.cpp b/src/plugins/General/covermanager/covermanager.cpp
index a01bffa60..f89af8756 100644
--- a/src/plugins/General/covermanager/covermanager.cpp
+++ b/src/plugins/General/covermanager/covermanager.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2012 by Ilya Kotov                                 *
+ *   Copyright (C) 2009-2013 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -40,16 +40,16 @@ CoverManager::CoverManager(QObject *parent) : QObject(parent)
 
 void CoverManager::showWindow()
 {
-    QList <PlayListTrack *> items = MediaPlayer::instance()->playListManager()->selectedPlayList()->selectedItems();
-    if (!items.isEmpty())
+    QList <PlayListTrack *> tracks = MediaPlayer::instance()->playListManager()->selectedPlayList()->selectedTracks();
+    if (!tracks.isEmpty())
     {
         CoverWidget *w = new CoverWidget(qApp->activeWindow ());
-        QPixmap pix = MetaDataManager::instance()->getCover(items.at(0)->url());
+        QPixmap pix = MetaDataManager::instance()->getCover(tracks.at(0)->url());
         if(pix.isNull())
             pix = QPixmap(":/cm_no_cover.png");
         w->setPixmap(pix);
         MetaDataFormatter formatter("%p%if(%p&%t, - ,)%if(%t,%t,%f)");
-        w->setWindowTitle(formatter.parse(items.at(0)));
+        w->setWindowTitle(formatter.parse(tracks.at(0)));
         w->show();
     }
 }
diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp
index 4283bb187..6e41178b7 100644
--- a/src/plugins/General/fileops/fileops.cpp
+++ b/src/plugins/General/fileops/fileops.cpp
@@ -85,7 +85,7 @@ void FileOps::execAction(int n)
     QString destination = m_destinations.at(n);
 
     PlayListModel *model = MediaPlayer::instance()->playListManager()->selectedPlayList();
-    QList<PlayListTrack*> items = model->selectedItems();
+    QList<PlayListTrack*> tracks = model->selectedTracks();
 
     switch (type)
     {
@@ -105,7 +105,7 @@ void FileOps::execAction(int n)
         progress.show();
         progress.setAutoClose (false);
         int i  = 0;
-        foreach(PlayListTrack *item, items)
+        foreach(PlayListTrack *item, tracks)
         {
             if (!QFile::exists(item->url()))
                 continue;
@@ -142,7 +142,7 @@ void FileOps::execAction(int n)
 
             progress.setMaximum(int(in.size()/COPY_BLOCK_SIZE));
             progress.setValue(0);
-            progress.setLabelText (QString(tr("Copying file %1/%2")).arg(++i).arg(items.size()));
+            progress.setLabelText (QString(tr("Copying file %1/%2")).arg(++i).arg(tracks.size()));
             progress.update();
 
             while (!in.atEnd ())
@@ -158,7 +158,7 @@ void FileOps::execAction(int n)
     }
     case RENAME:
         qDebug("FileOps: rename");
-        foreach(PlayListTrack *item, items)
+        foreach(PlayListTrack *item, tracks)
         {
             if (!QFile::exists(item->url()))
                 continue;
@@ -187,14 +187,14 @@ void FileOps::execAction(int n)
         qDebug("FileOps: remove");
         if (QMessageBox::question (qApp->activeWindow (), tr("Remove files"),
                                    tr("Are you sure you want to remove %n file(s) from disk?",
-                                      "",items.size()),
+                                      "",tracks.size()),
                                    QMessageBox::Yes | QMessageBox::No) !=  QMessageBox::Yes)
             break;
 
-        foreach(PlayListTrack *item, items)
+        foreach(PlayListTrack *track, tracks)
         {
-            if (QFile::exists(item->url()) && QFile::remove(item->url()))
-                model->removeAt (model->indexOf(item));
+            if (QFile::exists(track->url()) && QFile::remove(track->url()))
+                model->removeTrack(track);
         }
     }
 }
diff --git a/src/plugins/General/lyrics/lyrics.cpp b/src/plugins/General/lyrics/lyrics.cpp
index fef704801..5e544d1b4 100644
--- a/src/plugins/General/lyrics/lyrics.cpp
+++ b/src/plugins/General/lyrics/lyrics.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2012 by Ilya Kotov                                 *
+ *   Copyright (C) 2009-2013 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -42,13 +42,13 @@ Lyrics::~Lyrics()
 void Lyrics::showLyrics()
 {
     PlayListManager *pl_manager = MediaPlayer::instance()->playListManager();
-    QList <PlayListTrack *> items = pl_manager->selectedPlayList()->selectedItems();
-    if (!items.isEmpty())
+    QList <PlayListTrack *> tracks = pl_manager->selectedPlayList()->selectedTracks();
+    if (!tracks.isEmpty())
     {
-        if (items.at(0)->value(Qmmp::ARTIST).isEmpty() || items.at(0)->value(Qmmp::TITLE).isEmpty())
+        if (tracks.at(0)->value(Qmmp::ARTIST).isEmpty() || tracks.at(0)->value(Qmmp::TITLE).isEmpty())
                 return;
-            LyricsWindow *w = new LyricsWindow(items.at(0)->value(Qmmp::ARTIST),
-                                               items.at(0)->value(Qmmp::TITLE), qApp->activeWindow ());
+            LyricsWindow *w = new LyricsWindow(tracks.at(0)->value(Qmmp::ARTIST),
+                                               tracks.at(0)->value(Qmmp::TITLE), qApp->activeWindow ());
             w->show();
     }
 }
diff --git a/src/plugins/General/mpris/mpris1/tracklistobject.cpp b/src/plugins/General/mpris/mpris1/tracklistobject.cpp
index e75900439..0fb498788 100644
--- a/src/plugins/General/mpris/mpris1/tracklistobject.cpp
+++ b/src/plugins/General/mpris/mpris1/tracklistobject.cpp
@@ -66,7 +66,7 @@ int TrackListObject::AddTrack(const QString &in0, bool in1)
 
 void TrackListObject::DelTrack(int in0)
 {
-    m_model->removeAt(in0);
+    m_model->removeTrack(in0);
 }
 
 int TrackListObject::GetCurrentTrack()
@@ -82,22 +82,22 @@ int TrackListObject::GetLength()
 QVariantMap TrackListObject::GetMetadata(int in0)
 {
     QVariantMap map;
-    PlayListTrack *item = m_model->item(in0);
-    if (item)
+    PlayListTrack *track = m_model->track(in0);
+    if (track)
     {
-        if (QFile::exists(item->url()))
-            map.insert("location", "file://" + item->url());
+        if (QFile::exists(track->url()))
+            map.insert("location", "file://" + track->url());
         else
-            map.insert("location", item->url());
-        map.insert("title", item->value(Qmmp::TITLE));
-        map.insert("artist", item->value(Qmmp::ARTIST));
-        map.insert("album", item->value(Qmmp::ALBUM));
-        map.insert("tracknumber", item->value(Qmmp::TRACK));
-        map.insert("time", (quint32)item->length());
-        map.insert("mtime", (quint32)item->length() * 1000);
-        map.insert("genre", item->value(Qmmp::GENRE));
-        map.insert("comment", item->value(Qmmp::COMMENT));
-        map.insert("year", item->value(Qmmp::YEAR).toUInt());
+            map.insert("location", track->url());
+        map.insert("title", track->value(Qmmp::TITLE));
+        map.insert("artist", track->value(Qmmp::ARTIST));
+        map.insert("album", track->value(Qmmp::ALBUM));
+        map.insert("tracknumber", track->value(Qmmp::TRACK));
+        map.insert("time", (quint32)track->length());
+        map.insert("mtime", (quint32)track->length() * 1000);
+        map.insert("genre", track->value(Qmmp::GENRE));
+        map.insert("comment", track->value(Qmmp::COMMENT));
+        map.insert("year", track->value(Qmmp::YEAR).toUInt());
     }
     return map;
 }
diff --git a/src/plugins/General/mpris/mpris2/player2object.cpp b/src/plugins/General/mpris/mpris2/player2object.cpp
index af22d1eb7..fe2885c7a 100644
--- a/src/plugins/General/mpris/mpris2/player2object.cpp
+++ b/src/plugins/General/mpris/mpris2/player2object.cpp
@@ -31,7 +31,7 @@
 
 Player2Object::Player2Object(QObject *parent) : QDBusAbstractAdaptor(parent)
 {
-    m_prev_item = 0;
+    m_prev_track = 0;
     m_previous_pos = 0;
     m_core = SoundCore::instance();
     m_player = MediaPlayer::instance();
@@ -62,7 +62,7 @@ bool Player2Object::canControl() const
 
 bool Player2Object::canGoNext() const
 {
-    return m_pl_manager->currentPlayList()->nextItem() != 0;
+    return m_pl_manager->currentPlayList()->nextTrack() != 0;
 }
 
 bool Player2Object::canGoPrevious() const
@@ -119,8 +119,8 @@ double Player2Object::maximumRate() const
 
 QVariantMap Player2Object::metadata() const
 {
-    PlayListTrack *item = m_pl_manager->currentPlayList()->currentItem();
-    if(!item || m_core->metaData(Qmmp::URL).isEmpty())
+    PlayListTrack *track = m_pl_manager->currentPlayList()->currentTrack();
+    if(!track || m_core->metaData(Qmmp::URL).isEmpty())
         return QVariantMap();
     QVariantMap map;
     map["mpris:length"] = qMax(m_core->totalTime() * 1000 , qint64(0));
@@ -318,10 +318,10 @@ void Player2Object::emitPropertiesChanged()
 
 void Player2Object::updateId()
 {
-    if(m_prev_item != m_pl_manager->currentPlayList()->currentItem())
+    if(m_prev_track != m_pl_manager->currentPlayList()->currentTrack())
     {
         m_trackID = QDBusObjectPath(QString("%1/Track/%2").arg("/org/qmmp/MediaPlayer2").arg(qrand()));
-        m_prev_item = m_pl_manager->currentPlayList()->currentItem();
+        m_prev_track = m_pl_manager->currentPlayList()->currentTrack();
     }
 }
 
diff --git a/src/plugins/General/mpris/mpris2/player2object.h b/src/plugins/General/mpris/mpris2/player2object.h
index b808f83e5..2e1696fee 100644
--- a/src/plugins/General/mpris/mpris2/player2object.h
+++ b/src/plugins/General/mpris/mpris2/player2object.h
@@ -109,7 +109,7 @@ private:
     PlayListManager *m_pl_manager;
     QMap<QString, QVariant> m_props;
     QDBusObjectPath m_trackID;
-    PlayListTrack *m_prev_item;
+    PlayListTrack *m_prev_track;
     qint64 m_previous_pos;
 
 };
diff --git a/src/plugins/General/trackchange/trackchange.cpp b/src/plugins/General/trackchange/trackchange.cpp
index 294176eb2..9ec0f0da1 100644
--- a/src/plugins/General/trackchange/trackchange.cpp
+++ b/src/plugins/General/trackchange/trackchange.cpp
@@ -96,7 +96,7 @@ void TrackChange::onFinised()
         qDebug("TrackChange: startig end of track command..");
         executeCommand(m_prevMetaData, m_endOfTrackCommand);
     }
-    if(!m_endOfPlCommand.isEmpty() && !m_plManager->currentPlayList()->nextItem())
+    if(!m_endOfPlCommand.isEmpty() && !m_plManager->currentPlayList()->nextTrack())
     {
         qDebug("TrackChange: startig end of playlist command..");
         executeCommand(m_prevMetaData, m_endOfPlCommand);