[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [artikulate] src/core: Use volume for output.
From:       Andreas Cord-Landwehr <cordlandwehr () kde ! org>
Date:       2013-05-25 11:52:24
Message-ID: 20130525115224.93319A6078 () git ! kde ! org
[Download RAW message or body]

Git commit 380decb800f76be25fce4e953b97e126c04895c5 by Andreas Cord-Landwehr.
Committed on 23/05/2013 at 23:05.
Pushed by cordlandwehr into branch 'master'.

Use volume for output.

M  +4    -3    src/core/phrase.cpp

http://commits.kde.org/artikulate/380decb800f76be25fce4e953b97e126c04895c5

diff --git a/src/core/phrase.cpp b/src/core/phrase.cpp
index 7f112a3..1852045 100644
--- a/src/core/phrase.cpp
+++ b/src/core/phrase.cpp
@@ -22,6 +22,7 @@
 #include "capturedevicecontroller.h"
 #include "unit.h"
 #include "course.h"
+#include "settings.h"
 
 #include <QMediaPlayer>
 
@@ -174,7 +175,7 @@ void Phrase::playbackSound()
 {
     kDebug() << "Playing authentic sound";
     m_audioOutput->setMedia(m_nativeSoundFile);
-    m_audioOutput->setVolume(50); //TODO use global config
+    m_audioOutput->setVolume(Settings::audioOutputVolume());
     m_audioOutput->play();
     m_currentPlayback = Sound;
 }
@@ -183,7 +184,7 @@ void Phrase::playbackNativeSoundBuffer()
 {
     kDebug() << "Playing sound buffer";
     m_audioOutput->setMedia(KUrl::fromLocalFile(m_nativeSoundBuffer.fileName()));
-    m_audioOutput->setVolume(50); //TODO use global config
+    m_audioOutput->setVolume(Settings::audioOutputVolume());
     m_audioOutput->play();
 }
 
@@ -191,7 +192,7 @@ void Phrase::playbackUserSound()
 {
     kDebug() << this << "Playback sound in file "<< m_userSoundFile.fileName();
     m_audioOutput->setMedia(KUrl::fromLocalFile(m_userSoundFile.fileName()));
-    m_audioOutput->setVolume(50); //TODO use global config
+    m_audioOutput->setVolume(Settings::audioOutputVolume());
     m_audioOutput->play();
     m_currentPlayback = UserSound;
 }

[prev in list] [next in list] [prev in thread] [next in thread]