do not load combine module for browser streams

diff --git a/murphy/classify.c b/murphy/classify.c
index cecc944..89bae92 100644 (file)
--- a/murphy/classify.c
+++ b/murphy/classify.c
@@ -317,7 +317,6 @@ pa_bool_t pa_classify_multiplex_stream(mir_node *node)
     static pa_bool_t multiplex[mir_application_class_end] = {
         [ mir_player  ] = TRUE,
         [ mir_game    ] = TRUE,
-        [ mir_browser ] = TRUE,
     };
 
     mir_node_type class;

diff --git a/murphy/murphy-ivi.lua b/murphy/murphy-ivi.lua
index 040da93..adf6e5e 100644 (file)
--- a/murphy/murphy-ivi.lua
+++ b/murphy/murphy-ivi.lua
@@ -86,9 +86,9 @@ application_class {
     route = {
         output = routing_group.default_output
     },
-    roles = { music = {0, "mandatory", "exclusive"},
-              video = {0, "mandatory", "exclusive"},
-             test  = {0, "mandatory", "exclusive"}
+    roles = { music   = {0, "mandatory", "exclusive"},
+              video   = {0, "mandatory", "exclusive"},
+             test    = {0, "mandatory", "exclusive"}
     }
 }
 
@@ -99,12 +99,11 @@ application_class {
     route = {
         output = routing_group.default_output
     },
-    roles = { animation = {0, "mandatory", "shared"} },
-    binaries = { firefox = {0, "mandatory","exclusive"},
-                 chrome  = {0, "mandatory", "exclusive"}
-    }
+    roles = { browser = {0, "mandatory", "shared"} }
 }
 
+
+
 audio_resource {
     name = { recording = "audio_recording", playback = "audio_playback" },
     attributes = {