i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

desklink: watch media_server quit event to disconnect itself.

Browse Source 
StartWatching() must be called for each notification type.

Change-Id: I34957af526a0af557a86eef0c3de5722f3503ca5
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2244
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Jérôme Duval
2020-02-15 13:31:17 +00:00
committed by Stephan Aßmus
parent a42a10c319
commit 3fded0b515
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/desklink/MediaReplicant.cpp
+10 -2
View File
@@ -408,6 +408,10 @@ MediaReplicant::MessageReceived(BMessage* message)
_ConnectMixer(); _ConnectMixer();
break; break;
case B_MEDIA_SERVER_QUIT:
_DisconnectMixer();
break;
case B_MEDIA_NODE_CREATED: case B_MEDIA_NODE_CREATED:
{ {
// It's not enough to wait for B_MEDIA_SERVER_STARTED message, as // It's not enough to wait for B_MEDIA_SERVER_STARTED message, as
@@ -594,7 +598,9 @@ MediaReplicant::_DisconnectMixer()
if (roster == NULL) if (roster == NULL)
return; return;
roster->StopWatching(this, B_MEDIA_SERVER_STARTED | B_MEDIA_NODE_CREATED); roster->StopWatching(this, B_MEDIA_SERVER_STARTED);
roster->StopWatching(this, B_MEDIA_SERVER_QUIT);
roster->StopWatching(this, B_MEDIA_NODE_CREATED);
if (fMixerControl == NULL) if (fMixerControl == NULL)
return; return;
@@ -618,7 +624,9 @@ MediaReplicant::_ConnectMixer()
if (roster == NULL) if (roster == NULL)
return B_ERROR; return B_ERROR;
roster->StartWatching(this, B_MEDIA_SERVER_STARTED | B_MEDIA_NODE_CREATED); roster->StartWatching(this, B_MEDIA_SERVER_STARTED);
roster->StartWatching(this, B_MEDIA_SERVER_QUIT);
roster->StartWatching(this, B_MEDIA_NODE_CREATED);
fMixerControl = new MixerControl(fVolumeWhich); fMixerControl = new MixerControl(fVolumeWhich);