Merge lp:~phablet-team/media-hub/reset-tracklist-open_uri into lp:media-hub

[Jim Hodapp]

Reset the tracklist everytime a client app calls open_uri() and disabling mpris interface by default (LP: #1449213)

Reset the tracklist everytime a client app calls open_uri().

[lp:~phablet-team/media-hub/reset-tracklist-open_uri]

136. By Jim Hodapp on 2015-04-27

Don't export the MPRIS2 interface since the indicator-sound is not working yet.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:136
http://jenkins.qa.ubuntu.com/job/media-hub-ci/349/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/189
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/189/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/189

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

review: Approve (continuous-integration)

[lp:~phablet-team/media-hub/reset-tracklist-open_uri]

137. By Ricardo Mendoza on 2015-04-27

Dont throw player impl if meta data is unretrievable

[Ricardo Mendoza (ricmm)]

review: Approve

=== modified file 'src/core/media/gstreamer/meta_data_extractor.h'
--- src/core/media/gstreamer/meta_data_extractor.h	2015-03-27 19:58:35 +0000
+++ src/core/media/gstreamer/meta_data_extractor.h	2015-04-27 23:02:03 +0000
@@ -191,7 +191,7 @@
         g_object_set(decoder, "uri", uri.c_str(), NULL);
         gst_element_set_state(pipe, GST_STATE_PAUSED);
 
-        if (std::future_status::ready != future.wait_for(std::chrono::seconds(2)))
+        if (std::future_status::ready != future.wait_for(std::chrono::seconds(4)))
         {
             gst_element_set_state(pipe, GST_STATE_NULL);
             throw std::runtime_error("Problem extracting meta data for track");
 
=== modified file 'src/core/media/player_implementation.cpp'
--- src/core/media/player_implementation.cpp	2015-04-20 17:56:05 +0000
+++ src/core/media/player_implementation.cpp	2015-04-27 23:02:03 +0000
@@ -573,6 +573,7 @@
 template<typename Parent>
 bool media::PlayerImplementation<Parent>::open_uri(const Track::UriType& uri)
 {
+    d->track_list->reset();
     // Set new track as the current track to play
     d->track_list->add_track_with_uri_at(uri, media::TrackList::after_empty_track(), true);
     return true;
 
=== modified file 'src/core/media/service_skeleton.cpp'
--- src/core/media/service_skeleton.cpp	2015-04-20 17:56:05 +0000
+++ src/core/media/service_skeleton.cpp	2015-04-27 23:02:03 +0000
@@ -476,7 +476,6 @@
 
         static std::string service_name()
         {
-#if 0
             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"
@@ -484,9 +483,6 @@
 
             return export_to_indicator_sound_via_mpris ? "org.mpris.MediaPlayer2.MediaHub" :
                                                          "hidden.org.mpris.MediaPlayer2.MediaHub";
-#else
-            return "org.mpris.MediaPlayer2.MediaHub";
-#endif
         }
 
         explicit Exported(const dbus::Bus::Ptr& bus, const media::CoverArtResolver& cover_art_resolver)
 
=== modified file 'src/core/media/track_list_implementation.cpp'
--- src/core/media/track_list_implementation.cpp	2015-04-20 17:48:48 +0000
+++ src/core/media/track_list_implementation.cpp	2015-04-27 23:02:03 +0000
@@ -99,9 +99,13 @@
     {
         if (d->meta_data_cache.count(id) == 0)
         {
-            d->meta_data_cache[id] = std::make_tuple(
-                        uri,
-                        d->extractor->meta_data_for_track_with_uri(uri));
+            try {
+                d->meta_data_cache[id] = std::make_tuple(
+                            uri,
+                            d->extractor->meta_data_for_track_with_uri(uri));
+            } catch (const std::runtime_error &e) {
+                std::cerr << "Failed to retrieve metadata for track '" << uri << "' (" << e.what() << ")" << std::endl;
+            }
         } else
         {
             std::get<0>(d->meta_data_cache[id]) = uri;