aboutsummaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/mainwindow.cpp7
-rw-r--r--src/ui/mainwindow.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index e8ce0b3bd..b2cff377d 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -148,6 +148,8 @@ MainWindow::MainWindow(const QStringList& args,CommandLineOptionManager* option_
connect(m_generalHandler, SIGNAL(pauseCalled()), SLOT(pause()));
connect(m_generalHandler, SIGNAL(toggleVisibilityCalled()), SLOT(toggleVisibility()));
connect(m_generalHandler, SIGNAL(exitCalled()), SLOT(close()));
+ connect(m_generalHandler, SIGNAL(volumeChanged(int, int)),
+ m_core, SLOT(setVolume(int, int)));
m_playListModel->readSettings();
char buf[PATH_MAX + 1];
@@ -356,6 +358,11 @@ void MainWindow::showOutputState(const OutputState &st)
case OutputState::Info:
{
m_elapsed = st.elapsedSeconds();
+ break;
+ }
+ case OutputState::Volume:
+ {
+ m_generalHandler->updateVolume(st.leftVolume(), st.rightVolume());
}
}
diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 0a1b6b60d..0ad44cec4 100644
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -65,6 +65,7 @@ public:
SoundCore* soundCore()const;
MainDisplay* mainDisplay()const;
bool processCommandArgs(const QStringList &list,const QString& cwd);
+
public slots:
void previous();
void play();