aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Ui
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2016-05-07 15:02:33 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2016-05-07 15:02:33 +0000
commite9574015d98899bb794fa6de20aa1cfc31bbdaa4 (patch)
tree6ee4688489d17a25152e12ccc877a5c44f8e5c32 /src/plugins/Ui
parent5b1c03e471c2a16480e1434d35b28a0606dcf7d6 (diff)
downloadqmmp-e9574015d98899bb794fa6de20aa1cfc31bbdaa4.tar.gz
qmmp-e9574015d98899bb794fa6de20aa1cfc31bbdaa4.tar.bz2
qmmp-e9574015d98899bb794fa6de20aa1cfc31bbdaa4.zip
added setting: volume adjustment step
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6327 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Ui')
-rw-r--r--src/plugins/Ui/qsui/mainwindow.cpp8
-rw-r--r--src/plugins/Ui/skinned/mainwindow.cpp8
2 files changed, 4 insertions, 12 deletions
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index 48097729e..a8784604a 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -630,12 +630,8 @@ void MainWindow::createActions()
m_ui.menuPlayback->addAction(SET_ACTION(ActionManager::STOP_AFTER_SELECTED, m_pl_manager,
SLOT(stopAfterSelected())));
m_ui.menuPlayback->addSeparator();
- signalMapper = new QSignalMapper(this);
- signalMapper->setMapping(ACTION(ActionManager::VOL_ENC), 5);
- signalMapper->setMapping(ACTION(ActionManager::VOL_DEC), -5);
- connect(signalMapper, SIGNAL(mapped(int)), m_core, SLOT(changeVolume(int)));
- m_ui.menuPlayback->addAction(SET_ACTION(ActionManager::VOL_ENC, signalMapper, SLOT(map())));
- m_ui.menuPlayback->addAction(SET_ACTION(ActionManager::VOL_DEC, signalMapper, SLOT(map())));
+ m_ui.menuPlayback->addAction(SET_ACTION(ActionManager::VOL_ENC, m_core, SLOT(volumeUp())));
+ m_ui.menuPlayback->addAction(SET_ACTION(ActionManager::VOL_DEC, m_core, SLOT(volumeDown())));
m_ui.menuPlayback->addAction(SET_ACTION(ActionManager::VOL_MUTE, m_core, SLOT(setMuted(bool))));
connect(m_core, SIGNAL(mutedChanged(bool)), ACTION(ActionManager::VOL_MUTE), SLOT(setChecked(bool)));
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index fca65bea4..f1e621d2d 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -432,12 +432,8 @@ void MainWindow::createActions()
ACTION(ActionManager::SHUFFLE), SLOT(setChecked(bool)));
QMenu *audioMenu = m_mainMenu->addMenu(tr("Audio"));
- QSignalMapper *mapper = new QSignalMapper(this);
- mapper->setMapping(ACTION(ActionManager::VOL_ENC), 5);
- mapper->setMapping(ACTION(ActionManager::VOL_DEC), -5);
- connect(mapper, SIGNAL(mapped(int)), m_core, SLOT(changeVolume(int)));
- audioMenu->addAction(SET_ACTION(ActionManager::VOL_ENC, mapper, SLOT(map())));
- audioMenu->addAction(SET_ACTION(ActionManager::VOL_DEC, mapper, SLOT(map())));
+ audioMenu->addAction(SET_ACTION(ActionManager::VOL_ENC, m_core, SLOT(volumeUp())));
+ audioMenu->addAction(SET_ACTION(ActionManager::VOL_DEC, m_core, SLOT(volumeDown())));
audioMenu->addAction(SET_ACTION(ActionManager::VOL_MUTE, m_core, SLOT(setMuted(bool))));
connect(m_core, SIGNAL(mutedChanged(bool)), ACTION(ActionManager::VOL_MUTE), SLOT(setChecked(bool)));