Removed volume control support

diff --git a/resources/black/directory.png b/resources/black/directory.png
new file mode 100644 (file)
index 0000000..448cb02
Binary files /dev/null and b/resources/black/directory.png differ

diff --git a/resources/resources.qrc b/resources/resources.qrc
index b2a926e..229926f 100644 (file)
--- a/resources/resources.qrc
+++ b/resources/resources.qrc
@@ -29,7 +29,6 @@
         <file>black/unmore_l.png</file>
         <file>black/unmore.png</file>
         <file>black/use.png</file>
-        <file>black/volume.png</file>
         <file>white/add.png</file>
         <file>white/artists.png</file>
         <file>white/back.png</file>
@@ -60,7 +59,6 @@
         <file>white/unmore_l.png</file>
         <file>white/unmore.png</file>
         <file>white/use.png</file>
-        <file>white/volume.png</file>
         <file>white/update.png</file>
         <file>black/update.png</file>
         <file>white/update-all.png</file>
@@ -69,5 +67,7 @@
         <file>black/update-pls.png</file>
         <file>white/arrow_r.png</file>
         <file>black/arrow_r.png</file>
+        <file>black/directory.png</file>
+        <file>white/directory.png</file>
     </qresource>
 </RCC>

diff --git a/resources/white/directory.png b/resources/white/directory.png
new file mode 100644 (file)
index 0000000..4d76966
Binary files /dev/null and b/resources/white/directory.png differ

diff --git a/src/config.cpp b/src/config.cpp
index d813d71..49ccfa4 100644 (file)
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -32,9 +32,6 @@ Config::Config()
                _settings->setValue("ui/albumsorting", "date");
        if (_settings->value("ui/gradient").toString() == "")
                _settings->setValue("ui/gradient", "yes");
-       if (_settings->value("playback/volume").isNull()) {
-               _settings->setValue("playback/volume", 100);
-       }
 }
 
 Config::~Config() {

diff --git a/src/player/player.cpp b/src/player/player.cpp
index d7594a6..3eaddc5 100644 (file)
--- a/src/player/player.cpp
+++ b/src/player/player.cpp
@@ -265,11 +265,6 @@ void Player::toggleRepeat() {
        _config.setValue("playback/repeat", _repeat);
 }
 
-void Player::setVolume(int v) {
-       _output->setVolume(v*0.01);
-       _config.setValue("playback/volume", v);
-}
-
 void Player::equalizerValue(int band, double *val) {
        if (_equalizer == NULL) {
                *val = 0;

diff --git a/src/player/player.h b/src/player/player.h
index d7ff555..0a417b8 100644 (file)
--- a/src/player/player.h
+++ b/src/player/player.h
@@ -27,7 +27,6 @@
 #include "../playlist.h"
 #include <phonon/MediaObject>
 #include <phonon/AudioOutput>
-#include <phonon/VolumeSlider>
 #include <phonon/Effect>
 #include <phonon/Path>
 #include <QStack>
@@ -65,7 +64,6 @@ namespace SomePlayer {
 
                        bool random() {return _random;}
                        RepeatRule repeat() {return _repeat;}
-                       int volume() {return (int)(_output->volume()*100 + 0.5);}
                        Phonon::MediaObject* mediaObject() {return _player;}
                        bool equalizerEnabled() {return _equalizer_enabled;}
                        bool equalizerAvailable() {return _equalizer != NULL;}
@@ -89,7 +87,6 @@ namespace SomePlayer {
                        void toggleRandom();
                        void toggleRepeat();
                        void seek(int);
-                       void setVolume(int);
                        void enableEqualizer();
                        void disableEqualizer();
                        void setEqualizerValue(int band, double value);

diff --git a/src/playerform.cpp b/src/playerform.cpp
index a7b67f9..f01eb99 100644 (file)
--- a/src/playerform.cpp
+++ b/src/playerform.cpp
@@ -81,12 +81,6 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
        _fscreen_button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
        _fscreen_button->hide();
 
-       ui->volumeSlider->setMinimum(0);
-       ui->volumeSlider->setMaximum(100);
-       ui->volumeSlider->setValue(config.getValue("playback/volume").toInt());
-       _player->setVolume(ui->volumeSlider->value());
-       ui->volumeSlider->hide();
-       ui->seekSlider->setEnabled(false);
        ui->progressLayout->removeItem(ui->seekSpacer);
        _tools_widget = new ToolsWidget(this);
        ui->toolsLayout->insertWidget(0, _tools_widget);
@@ -121,7 +115,6 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
        connect(ui->randomButton, SIGNAL(clicked()), this, SLOT(_toggle_random()));
        connect(ui->repeatButton, SIGNAL(clicked()), this, SLOT(_toggle_repeat()));
        connect(ui->seekSlider, SIGNAL(sliderMoved(int)), _player, SLOT(seek(int)));
-       connect(ui->volumeSlider, SIGNAL(sliderMoved(int)), _player, SLOT(setVolume(int)));
        connect(ui->playlistView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(_custom_context_menu_requested(QPoint)));
        connect(clear_playlist, SIGNAL(triggered()), this, SIGNAL(clearPlaylist()));
        connect(delete_action, SIGNAL(triggered()), this, SLOT(_delete_track()));
@@ -132,7 +125,7 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
        connect(_player, SIGNAL(stateChanged(PlayerState)), this, SLOT(_state_changed(PlayerState)));
        connect(_player, SIGNAL(trackDone(Track)), _lib, SLOT(updateTrackCount(Track)));
        connect(_tag_resolver, SIGNAL(decoded(Track)), this, SLOT(_track_decoded(Track)));
-       connect(ui->volumeButton, SIGNAL(clicked()), this, SLOT(_toggle_volume()));
+       connect(ui->dirButton, SIGNAL(clicked()), this, SLOT(_dirview()));
        connect(ui->moreButton, SIGNAL(clicked()), this, SLOT(_tools_widget_toggle()));
        connect(_tools_widget, SIGNAL(search(QString)), this, SLOT(search(QString)));
        connect(_tools_widget, SIGNAL(nextSearch()), this, SLOT(nextItem()));
@@ -400,18 +393,8 @@ void PlayerForm::stop() {
        _player->stop();
 }
 
-void PlayerForm::_toggle_volume() {
-       if (ui->volumeSlider->isVisible()) {
-               ui->volumeSlider->hide();
-       } else {
-               ui->volumeSlider->show();
-               ui->volumeSlider->setValue(_player->volume());
-       }
-}
+void PlayerForm::_dirview() {
 
-void PlayerForm::_volume_changed() {
-       int value = ui->volumeSlider->value();
-       _player->setVolume(value);
 }
 
 void PlayerForm::landscapeMode() {
@@ -444,7 +427,7 @@ void PlayerForm::landscapeMode() {
        ui->bhorizontalLayout->addWidget(ui->moreButton);
        ui->bhorizontalLayout->addWidget(_fscreen_button);
        ui->bhorizontalLayout->addItem(ui->chorizontalSpacer_4);
-       ui->bhorizontalLayout->addWidget(ui->volumeButton);
+       ui->bhorizontalLayout->addWidget(ui->dirButton);
 
        if (_tools_widget->isVisible()) {
                ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/more.png"));
@@ -495,7 +478,7 @@ void PlayerForm::portraitMode() {
        ui->bottomWidget->layout()->addItem(ui->bhorizontalSpacer_2);
        ui->bottomWidget->layout()->addWidget(ui->repeatButton);
        ui->bottomWidget->layout()->addItem(ui->bhorizontalSpacer_3);
-       ui->bottomWidget->layout()->addWidget(ui->volumeButton);
+       ui->bottomWidget->layout()->addWidget(ui->dirButton);
 
        if (_tools_widget->isVisible()) {
                ui->moreButton->setIcon(QIcon(":/icons/"+_icons_theme+"/unmore.png"));
@@ -531,7 +514,7 @@ void PlayerForm::updateIcons() {
        ui->nextButton->setIcon(QIcon(":/icons/"+_icons_theme+"/next.png"));
        ui->stopButton->setIcon(QIcon(":/icons/"+_icons_theme+"/stop.png"));
        ui->prevButton->setIcon(QIcon(":/icons/"+_icons_theme+"/prev.png"));
-       ui->volumeButton->setIcon(QIcon(":/icons/"+_icons_theme+"/volume.png"));
+       ui->dirButton->setIcon(QIcon(":/icons/"+_icons_theme+"/directory.png"));
        if (_player->state() == PLAYER_PLAYING) {
                ui->playpauseButton->setIcon(QIcon(":/icons/"+_icons_theme+"/pause.png"));
        } else {

diff --git a/src/playerform.h b/src/playerform.h
index 8ed8da2..21ab858 100644 (file)
--- a/src/playerform.h
+++ b/src/playerform.h
@@ -81,6 +81,7 @@ public slots:
 
 private slots:
        void _library();
+       void _dirview();
        void _toggle_view();
        void _process_click(QModelIndex);
        void _track_changed(Track);
@@ -95,9 +96,7 @@ private slots:
        void _state_changed(PlayerState);
        void _toggle_repeat();
        void _toggle_random();
-       void _toggle_volume();
        void _track_decoded(Track);
-       void _volume_changed();
        void _tools_widget_toggle();
 
 private:

diff --git a/src/ui/playerform.ui b/src/ui/playerform.ui
index 880b6d7..5744bd5 100644 (file)
--- a/src/ui/playerform.ui
+++ b/src/ui/playerform.ui
@@ -345,55 +345,6 @@
        </widget>
       </widget>
      </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>10</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QSlider" name="volumeSlider">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="invertedAppearance">
-          <bool>false</bool>
-         </property>
-         <property name="invertedControls">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>10</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
     </layout>
    </item>
    <item>
@@ -776,7 +727,7 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="volumeButton">
+      <widget class="QPushButton" name="dirButton">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -794,7 +745,7 @@
        </property>
        <property name="icon">
         <iconset resource="../../resources/resources.qrc">
-         <normaloff>:/icons/white/volume.png</normaloff>:/icons/white/volume.png</iconset>
+         <normaloff>:/icons/white/directory.png</normaloff>:/icons/white/directory.png</iconset>
        </property>
        <property name="flat">
         <bool>true</bool>