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

Sync muted state as well

Browse Source
This commit is contained in:
Dominik Schmidt
2016-02-22 01:13:49 +01:00
parent b7ff630808
commit fa38ed5e91
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,6 +172,7 @@ AudioEngine::AudioEngine()
connect( d->audioOutput, SIGNAL( tick( qint64 ) ), SLOT( timerTriggered( qint64 ) ) ); connect( d->audioOutput, SIGNAL( tick( qint64 ) ), SLOT( timerTriggered( qint64 ) ) );
connect( d->audioOutput, SIGNAL( positionChanged( float ) ), SLOT( onPositionChanged( float ) ) ); connect( d->audioOutput, SIGNAL( positionChanged( float ) ), SLOT( onPositionChanged( float ) ) );
connect( d->audioOutput, SIGNAL( volumeChanged( qreal ) ), SLOT( onVolumeChanged( qreal ) ) ); connect( d->audioOutput, SIGNAL( volumeChanged( qreal ) ), SLOT( onVolumeChanged( qreal ) ) );
connect( d->audioOutput, SIGNAL( mutedChanged( bool ) ), SIGNAL( mutedChanged( bool ) ) );
setVolume( TomahawkSettings::instance()->volume() ); setVolume( TomahawkSettings::instance()->volume() );

10
src/libtomahawk/audio/AudioOutput.cpp
View File

@@ -124,6 +124,8 @@ AudioOutput::AudioOutput( QObject* parent )
libvlc_MediaPlayerSnapshotTaken, libvlc_MediaPlayerSnapshotTaken,
//libvlc_MediaPlayerLengthChanged, //libvlc_MediaPlayerLengthChanged,
libvlc_MediaPlayerAudioVolume, libvlc_MediaPlayerAudioVolume,
libvlc_MediaPlayerMuted,
libvlc_MediaPlayerUnmuted,
libvlc_MediaPlayerVout libvlc_MediaPlayerVout
}; };
const int eventCount = sizeof(events) / sizeof( *events ); const int eventCount = sizeof(events) / sizeof( *events );
@@ -583,6 +585,14 @@ AudioOutput::onVlcEvent( const libvlc_event_t* event )
case libvlc_MediaPlayerAudioVolume: case libvlc_MediaPlayerAudioVolume:
emit volumeChanged( event->u.media_player_audio_volume.volume ); emit volumeChanged( event->u.media_player_audio_volume.volume );
break; break;
case libvlc_MediaPlayerMuted:
m_muted = true;
emit mutedChanged( true );
break;
case libvlc_MediaPlayerUnmuted:
m_muted = false;
emit mutedChanged( false );
break;
case libvlc_MediaPlayerNothingSpecial: case libvlc_MediaPlayerNothingSpecial:
case libvlc_MediaPlayerOpening: case libvlc_MediaPlayerOpening:
case libvlc_MediaPlayerBuffering: case libvlc_MediaPlayerBuffering:

1
src/libtomahawk/audio/AudioOutput.h
View File

@@ -80,6 +80,7 @@ signals:
void tick( qint64 ); void tick( qint64 );
void positionChanged( float ); void positionChanged( float );
void volumeChanged( qreal volume ); void volumeChanged( qreal volume );
void mutedChanged( bool );
private: private:
void onInitVlcEvent( const libvlc_event_t* event ); void onInitVlcEvent( const libvlc_event_t* event );