Merge lp:~thomas-voss/media-hub/do-not-export-to-mpris-by-default into lp:media-hub

[Thomas Voß]

Only expose the service as MPRIS instance if explicitly requested via env variable.

Only expose the service as MPRIS instance if explicitly requested via env variable.

[Alberto Aguirre (albaguirre)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/media-hub-ci/141/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-armhf-ci/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-utopic-i386-ci/81

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/141/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-28 07:17:42 +0000
+++ CMakeLists.txt	2014-10-14 16:23:04 +0000
@@ -24,6 +24,7 @@
 find_package(GLog)
 pkg_check_modules(DBUS dbus-1 REQUIRED)
 pkg_check_modules(DBUS_CPP dbus-cpp REQUIRED)
+pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
 pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED)
 pkg_check_modules(GIO gio-2.0 REQUIRED)
 pkg_check_modules(HYBRIS_MEDIA libmedia REQUIRED)
@@ -53,6 +54,7 @@
   ${DBUS_INCLUDE_DIRS}
   ${DBUS_CPP_INCLUDE_DIRS}
   ${GLog_INCLUDE_DIR}
+  ${PROCESS_CPP_INCLUDE_DIRS}
   ${PROPERTIES_CPP_INCLUDE_DIRS}
 
   include/

=== modified file 'src/core/media/CMakeLists.txt'
--- src/core/media/CMakeLists.txt	2014-09-09 14:02:52 +0000
+++ src/core/media/CMakeLists.txt	2014-10-14 16:23:04 +0000
@@ -95,6 +95,7 @@
   ${DBUS_CPP_LDFLAGS}
   ${GLog_LIBRARY}
   ${PC_GSTREAMER_1_0_LIBRARIES}
+  ${PROCESS_CPP_LDFLAGS}
   ${GIO_LIBRARIES}
   ${HYBRIS_MEDIA_LIBRARIES}
 )

=== modified file 'src/core/media/service_skeleton.cpp'
--- src/core/media/service_skeleton.cpp	2014-09-09 21:27:29 +0000
+++ src/core/media/service_skeleton.cpp	2014-10-14 16:23:04 +0000
@@ -34,6 +34,8 @@
 #include <core/dbus/object.h>
 #include <core/dbus/types/object_path.h>
 
+#include <core/posix/this_process.h>
+
 #include <map>
 #include <regex>
 #include <sstream>
@@ -157,9 +159,20 @@
             return defaults;
         }
 
+        static std::string service_name()
+        {
+            static const bool export_to_indicator_sound_via_mpris
+            {
+                core::posix::this_process::env::get("UBUNTU_MEDIA_HUB_EXPORT_TO_INDICATOR_VIA_MPRIS", "0") == "1"
+            };
+
+            return export_to_indicator_sound_via_mpris ? "org.mpris.MediaPlayer2.MediaHub" :
+                                                         "hidden.org.mpris.MediaPlayer2.MediaHub";
+        }
+
         explicit Exported(const dbus::Bus::Ptr& bus, const media::CoverArtResolver& cover_art_resolver)
             : bus{bus},
-              service{dbus::Service::add_service(bus, "org.mpris.MediaPlayer2.MediaHub")},
+              service{dbus::Service::add_service(bus, service_name())},
               object{service->add_object_for_path(dbus::types::ObjectPath{"/org/mpris/MediaPlayer2"})},
               media_player{mpris::MediaPlayer2::Skeleton::Configuration{bus, object, media_player_defaults()}},
               player{mpris::Player::Skeleton::Configuration{bus, object, player_defaults()}},

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2014-09-09 14:48:51 +0000
+++ tests/unit-tests/CMakeLists.txt	2014-10-14 16:23:04 +0000
@@ -33,6 +33,7 @@
     ${DBUS_CPP_LDFLAGS}
     ${GLog_LIBRARY}
     ${PC_GSTREAMER_1_0_LIBRARIES}
+    ${PROCESS_CPP_LDFLAGS}
     ${GIO_LIBRARIES}
 
     gmock