mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-11 16:44:05 +02:00
Code Issues Releases Wiki Activity

* Fixed TWK-812: Persistent volume settings across sessions.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-05-27 18:24:16 +02:00
parent 8830593f1d
commit 5e0d8d2292
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libtomahawk/audio/AudioEngine.cpp
View File

@@ -86,19 +86,16 @@ AudioEngine::AudioEngine()
onVolumeChanged( m_audioOutput->volume() ); onVolumeChanged( m_audioOutput->volume() );
#ifndef Q_WS_X11 setVolume( TomahawkSettings::instance()->volume() );
// On mac & win, phonon volume is independent from system volume, so the onVolumeChanged call above just sets our volume to 100%.
// Since it's indendent, we'll set it to 75% since that's nicer.
setVolume( 75 );
#endif
} }
AudioEngine::~AudioEngine() AudioEngine::~AudioEngine()
{ {
tDebug() << Q_FUNC_INFO; tDebug() << Q_FUNC_INFO;
m_mediaObject->stop(); m_mediaObject->stop();
// stop(); TomahawkSettings::instance()->setVolume( volume() );
delete m_audioOutput; delete m_audioOutput;
delete m_mediaObject; delete m_mediaObject;