Ticket #11922: 0011-VolumeControl-and-Media-preferences-add-support-for-.patch

src/bin/desklink/VolumeControl.cpp

@@ -19 +19 @@
 #include <Catalog.h>
 #include <ControlLook.h>
 #include <Dragger.h>
+#include <MediaRoster.h>
 #include <MessageRunner.h>
-#include <Roster.h>
 
 #include <AppMisc.h>
 
@@ -35 +35 @@
 #define B_TRANSLATION_CONTEXT "VolumeControl"
 
 
-static const char* kMediaServerSignature = "application/x-vnd.Be.media-server";
-static const char* kAddOnServerSignature = "application/x-vnd.Be.addon-host";
 
 static const uint32 kMsgReconnectVolume = 'rcms';
 
@@ -130 +128 @@
     else
         SetEventMask(B_POINTER_EVENTS, B_NO_POINTER_HISTORY);
 
-    be_roster->StartWatching(this, B_REQUEST_LAUNCHED | B_REQUEST_QUIT);
+    BMediaRoster* roster = BMediaRoster::Roster();
+    roster->StartWatching(BMessenger(this), B_MEDIA_SERVER_STARTED);
+    roster->StartWatching(BMessenger(this), B_MEDIA_SERVER_QUIT);
 
     _ConnectVolume();
 
@@ -149 +149 @@
 {
     _DisconnectVolume();
 
-    be_roster->StopWatching(this);
+    BMediaRoster* roster = BMediaRoster::CurrentRoster();
+    roster->StopWatching(BMessenger(this), B_MEDIA_SERVER_STARTED);
+    roster->StopWatching(BMessenger(this), B_MEDIA_SERVER_QUIT);
 }
 
 
@@ -293 +295 @@
             SetValue((int32)fMixerControl->Volume());
             break;
 
-        case B_SOME_APP_LAUNCHED:
-        case B_SOME_APP_QUIT:
+        case B_MEDIA_SERVER_STARTED:
         {
-            const char* signature;
-            if (msg->FindString("be:signature", &signature) != B_OK)
-                break;
-
-            bool isMediaServer = !strcmp(signature, kMediaServerSignature);
-            bool isAddOnServer = !strcmp(signature, kAddOnServerSignature);
-            if (isMediaServer)
-                fMediaServerRunning = msg->what == B_SOME_APP_LAUNCHED;
-            if (isAddOnServer)
-                fAddOnServerRunning = msg->what == B_SOME_APP_LAUNCHED;
-
-           if (isMediaServer || isAddOnServer) {
-                if (!fMediaServerRunning && !fAddOnServerRunning) {
-                    // No media server around
-                    SetLabel(B_TRANSLATE("No media server running"));
-                    SetEnabled(false);
-                } else if (fMediaServerRunning && fAddOnServerRunning) {
-                    // HACK!
-                    // quit our now invalid instance of the media roster
-                    // so that before new nodes are created,
-                    // we get a new roster
-                    BMediaRoster* roster = BMediaRoster::CurrentRoster();
-                    if (roster != NULL) {
-                        roster->Lock();
-                        roster->Quit();
-                    }
-
-                    BMessage reconnect(kMsgReconnectVolume);
-                    BMessageRunner::StartSending(this, &reconnect, 1000000LL, 1);
-                    fConnectRetries = 3;
-                }
-            }
+            BMessage reconnect(kMsgReconnectVolume);
+            BMessageRunner::StartSending(this, &reconnect, 1000000LL, 1);
+            fConnectRetries = 3;
+            break;
+        }
+        case B_MEDIA_SERVER_QUIT:
+        {
+            // No media server around
+            SetLabel(B_TRANSLATE("No media server running"));
+            SetEnabled(false);
             break;
         }
 

src/preferences/media/Media.cpp

@@ -14 +14 @@
 
 #include <Catalog.h>
 #include <Locale.h>
-#include <Roster.h>
 #include <StorageKit.h>
 #include <String.h>
 
@@ -59 +58 @@
 
     MediaListItem::SetIcons(&fIcons);
     fWindow = new MediaWindow(rect);
-
-    be_roster->StartWatching(BMessenger(this));
 }
 
 
 Media::~Media()
 {
-    be_roster->StopWatching(BMessenger(this));
 }
 
 
@@ -83 +79 @@
 Media::MessageReceived(BMessage* message)
 {
     switch (message->what) {
-        case B_SOME_APP_LAUNCHED:
-        case B_SOME_APP_QUIT:
-            fWindow->PostMessage(message);
-            break;
-
         default:
             BApplication::MessageReceived(message);
             break;

src/preferences/media/MediaWindow.cpp

@@ -167 +167 @@
     fInitCheck(B_OK)
 {
     _InitWindow();
+
+    BMediaRoster* roster = BMediaRoster::Roster();
+    roster->StartWatching(BMessenger(this, this), B_MEDIA_SERVER_STARTED);
 }
 
 
@@ -188 +191 @@
         if (file.InitCheck() == B_OK)
             file.Write(buffer, strlen(buffer));
     }
+    BMediaRoster* roster = BMediaRoster::CurrentRoster();
+    roster->StopWatching(BMessenger(this, this), B_MEDIA_SERVER_STARTED);
 }
 
 
@@ -313 +318 @@
             item->AlterWindow(this);
             break;
         }
-        case B_SOME_APP_LAUNCHED:
+        case B_MEDIA_SERVER_STARTED:
         {
             PRINT_OBJECT(*message);
 
-            BString mimeSig;
-            if (message->FindString("be:signature", &mimeSig) == B_OK
-                && (mimeSig == "application/x-vnd.Be.addon-host"
-                    || mimeSig == "application/x-vnd.Be.media-server")) {
-                _Notify(0.75, B_TRANSLATE("Starting media server"
-                    B_UTF8_ELLIPSIS));
-            }
-            break;
-        }
-        case B_SOME_APP_QUIT:
-        {
-            PRINT_OBJECT(*message);
-            BString mimeSig;
-            if (message->FindString("be:signature", &mimeSig) == B_OK) {
-                if (mimeSig == "application/x-vnd.Be.addon-host"
-                    || mimeSig == "application/x-vnd.Be.media-server") {
-                    BMediaRoster* roster = BMediaRoster::CurrentRoster();
-                    if (roster != NULL && roster->Lock())
-                        roster->Quit();
-                }
-            }
+            _Notify(0.75, B_TRANSLATE("Starting media server"
+                B_UTF8_ELLIPSIS));
             break;
         }
         default:
@@ -633 +619 @@
 MediaWindow::_RestartMediaServices(void* data)
 {
     MediaWindow* window = (MediaWindow*)data;
-    
+
     shutdown_media_server(B_INFINITE_TIMEOUT, MediaWindow::_UpdateProgress,
         data);