enabled equalizer auto-presets

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

4 files changed, 23 insertions, 29 deletions

diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index 54450b705..d379d4c92 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2012 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2013 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,6 +24,7 @@
 #include <QCloseEvent>
 #include <QFile>
 #include <qmmpui/filedialog.h>
+#include <qmmpui/playlistmanager.h>
 #include <qmmp/soundcore.h>
 #include "skin.h"
 #include "eqslider.h"
@@ -323,22 +324,22 @@ void EqWidget::savePreset()
 
 void EqWidget::saveAutoPreset()
 {
-    PlayList* playlist;// = qobject_cast<MainWindow*>(parent())->playlist();
-    /*if (!playlist->currentItem())
-        return;*/
+    PlayListTrack *track = PlayListManager::instance()->currentPlayList()->currentTrack();
+    if (!track)
+        return;
     //delete preset if it already exists
-    //EQPreset* preset = findPreset(playlist->currentItem()->url().section("/",-1));
-    //if (preset)
-    //    deletePreset(preset);
+    EQPreset* preset = findPreset(track->url().section("/",-1));
+    if (preset)
+        deletePreset(preset);
     //create new preset
-    //preset = new EQPreset();
-    //preset->setText(playlist->currentItem()->url().section("/",-1));
-    /*preset->setPreamp(m_preamp->value());
+    preset = new EQPreset();
+    preset->setText(track->url().section("/",-1));
+    preset->setPreamp(m_preamp->value());
     for (int i = 0; i<10; ++i)
     {
         preset->setGain(i, m_sliders.at (i)->value());
     }
-    m_autoPresets.append(preset);*/
+    m_autoPresets.append(preset);
 }
 
 void EqWidget::setPreset(EQPreset* preset)
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index d46e8e315..0fe9f6522 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2012 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2013 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -117,9 +117,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 }
 
 MainWindow::~MainWindow()
-{
-    qDebug("%s", Q_FUNC_INFO);
-}
+{}
 
 void MainWindow::play()
 {
@@ -174,15 +172,15 @@ void MainWindow::showState(Qmmp::State state)
     switch ((int) state)
     {
     case Qmmp::Playing:
-        //if (m_pl_manager->currentPlayList()->currentItem())
-        //    m_equalizer->loadPreset(m_pl_manager->currentPlayList()->currentItem()->url().section("/",-1));
+        if (m_pl_manager->currentPlayList()->currentTrack())
+            m_equalizer->loadPreset(m_pl_manager->currentPlayList()->currentTrack()->url().section("/",-1));
         break;
     case Qmmp::Paused:
         break;
     case Qmmp::Stopped:
         m_playlist->setTime(-1);
-        if (m_playlist->currentItem())
-            setWindowTitle(m_playlist->currentItem()->formattedTitle());
+        if (m_pl_manager->currentPlayList()->currentTrack())
+            setWindowTitle(m_pl_manager->currentPlayList()->currentTrack()->formattedTitle());
         else
             setWindowTitle("Qmmp");
         break;
@@ -191,11 +189,11 @@ void MainWindow::showState(Qmmp::State state)
 
 void MainWindow::showMetaData()
 {
-    /*if (m_playlist->currentItem() &&
-        m_playlist->currentItem()->url() == m_core->metaData().value(Qmmp::URL))
+    PlayListTrack *track = m_pl_manager->currentPlayList()->currentTrack();
+    if (track && track->url() == m_core->metaData().value(Qmmp::URL))
     {
-        setWindowTitle(m_playlist->currentItem()->formattedTitle());
-    }*/
+        setWindowTitle(track->formattedTitle());
+    }
 }
 
 void MainWindow::closeEvent (QCloseEvent *)
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index 73aebc510..5a1bf2220 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -520,11 +520,6 @@ void PlayList::updateList()
     m_titleBar->showCurrent();
 }
 
-PlayListItem *PlayList::currentItem()
-{
-    return m_pl_manager->currentPlayList()->currentTrack();
-}
-
 void PlayList::showPlaylistMenu()
 {
     m_playlistMenu->exec (m_playlistButton->mapToGlobal (QPoint (0,0)));
diff --git a/src/plugins/Ui/skinned/playlist.h b/src/plugins/Ui/skinned/playlist.h
index fc1bd3959..64e50d318 100644
--- a/src/plugins/Ui/skinned/playlist.h
+++ b/src/plugins/Ui/skinned/playlist.h
@@ -52,7 +52,7 @@ class PlayList : public QWidget
         virtual ~PlayList();
 
         void readSettings();
-        PlayListItem *currentItem();
+
         ListWidget* listWidget() const
         {
             return m_listWidget;