mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 07:36:48 +02:00
Code Issues Releases Wiki Activity

* Clicking the speaker icon toggles mute.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-08-20 11:57:49 +02:00
parent 828e65ff54
commit 793713c2a1
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -541,6 +541,9 @@ AudioEngine::setVolume( int percentage )
percentage = qBound( 0, percentage, 100 ); percentage = qBound( 0, percentage, 100 );
d->audioOutput->setVolume( (qreal)percentage / 100.0 ); d->audioOutput->setVolume( (qreal)percentage / 100.0 );
if ( percentage > 0 )
d->audioOutput->setMuted( false );
emit volumeChanged( percentage ); emit volumeChanged( percentage );
} }
@@ -559,10 +562,28 @@ AudioEngine::raiseVolume()
} }
bool
AudioEngine::isMuted() const
{
return d_func()->audioOutput->isMuted();
}
void void
AudioEngine::mute() AudioEngine::mute()
{ {
setVolume( 0 ); Q_D( AudioEngine );
d->audioOutput->setMuted( true );
emit volumeChanged( 0 );
}
void
AudioEngine::toggleMute()
{
Q_D( AudioEngine );
d->audioOutput->setMuted( !d->audioOutput->isMuted() );
emit volumeChanged( d->audioOutput->isMuted() ? 0 : volume() );
} }

2
src/libtomahawk/audio/AudioEngine.h
View File

@@ -67,6 +67,7 @@ public:
bool isPlaying() const; bool isPlaying() const;
bool isPaused() const; bool isPaused() const;
bool isStopped() const; bool isStopped() const;
bool isMuted() const;
/** /**
* Returns the PlaylistInterface of the currently playing track. * Returns the PlaylistInterface of the currently playing track.
@@ -133,6 +134,7 @@ public slots:
void lowerVolume(); void lowerVolume();
void raiseVolume(); void raiseVolume();
void mute(); void mute();
void toggleMute();
void playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::result_ptr& result, const Tomahawk::query_ptr& fromQuery = Tomahawk::query_ptr() ); void playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::result_ptr& result, const Tomahawk::query_ptr& fromQuery = Tomahawk::query_ptr() );
void playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::query_ptr& query ); void playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::query_ptr& query );

2
src/tomahawk/AudioControls.cpp
View File

@@ -132,7 +132,7 @@ AudioControls::AudioControls( QWidget* parent )
connect( ui->playPauseButton, SIGNAL( clicked() ), AudioEngine::instance(), SLOT( play() ) ); connect( ui->playPauseButton, SIGNAL( clicked() ), AudioEngine::instance(), SLOT( play() ) );
connect( ui->pauseButton, SIGNAL( clicked() ), AudioEngine::instance(), SLOT( pause() ) ); connect( ui->pauseButton, SIGNAL( clicked() ), AudioEngine::instance(), SLOT( pause() ) );
connect( ui->nextButton, SIGNAL( clicked() ), AudioEngine::instance(), SLOT( next() ) ); connect( ui->nextButton, SIGNAL( clicked() ), AudioEngine::instance(), SLOT( next() ) );
// connect( ui->volumeLowButton, SIGNAL( clicked() ), AudioEngine::instance(), SLOT( lowerVolume() ) ); connect( ui->volumeLowButton, SIGNAL( clicked() ), AudioEngine::instance(), SLOT( toggleMute() ) );
// connect( ui->volumeHighButton, SIGNAL( clicked() ), AudioEngine::instance(), SLOT( raiseVolume() ) ); // connect( ui->volumeHighButton, SIGNAL( clicked() ), AudioEngine::instance(), SLOT( raiseVolume() ) );
connect( ui->playPauseButton, SIGNAL( clicked() ), SIGNAL( playPressed() ) ); connect( ui->playPauseButton, SIGNAL( clicked() ), SIGNAL( playPressed() ) );