Merge lp:~justinmcp/oxide/media-hub-audio-fixes into lp:~oxide-developers/oxide/oxide.trunk

[Justin McPherson]

Fixes to media-hub audio playback.

[lp:~justinmcp/oxide/media-hub-audio-fixes]

952. By Justin McPherson <justin@phablet-dev> on 2015-02-17

Don't capture the shared player instance.

[Chris Coulson (chrisccoulson)]

Thanks for this, although I'm not entirely sure what the fixes are for. I'll trust that they're correct :)

review: Approve

=== modified file 'shared/browser/media/mediahub_player_shim.cc'
--- shared/browser/media/mediahub_player_shim.cc	2015-01-16 23:12:06 +0000
+++ shared/browser/media/mediahub_player_shim.cc	2015-02-17 14:23:15 +0000
@@ -9,23 +9,35 @@
 
 namespace {
 
-std::map<int, std::shared_ptr<Player> > g_mediahub_players;
+typedef std::map<int, std::shared_ptr<Player> > player_map;
+
+player_map g_mediahub_players;
+
+player_map::iterator find_player(Player *player)
+{
+  player_map::iterator it = g_mediahub_players.begin();
+  for (; it != g_mediahub_players.end(); it++) {
+    if (it->second.get() == player) {
+      break;
+    }
+  }
+  return it;
+}
 
 void setup_delegate(MediaHubDelegate *delegate, std::shared_ptr<Player>& player)
 {
   player->seeked_to().connect([delegate](int64_t pos) {
-        delegate->seeked_to(pos);
+          delegate->seeked_to(pos);
       });
 
   player->end_of_stream().connect([delegate]() {
-        delegate->end_of_stream();
+          delegate->end_of_stream();
       });
 
-  player->playback_status_changed().connect([player, delegate](Player::PlaybackStatus status) {
-        delegate->playback_status_changed(
-                    static_cast<MediaHubDelegate::Status>(status),
-                    player->duration().get()
-                  );
+  player->playback_status_changed().connect([delegate](Player::PlaybackStatus status) {
+          delegate->playback_status_changed(
+                      static_cast<MediaHubDelegate::Status>(status)
+                    );
       });
 }
 }
@@ -80,8 +92,7 @@
       setup_delegate(delegate, player);
 
       delegate->playback_status_changed(
-                    MediaHubDelegate::Status(player->playback_status().get()),
-                    player->duration().get()
+                    MediaHubDelegate::Status(player->playback_status().get())
                   );
     }
 
@@ -217,12 +228,7 @@
 mediahub_release(MediaHubClientHandle handle)
 {
   try {
-    auto it = g_mediahub_players.begin();
-    for (; it != g_mediahub_players.end(); it++) {
-      if (it->second.get() == handle) {
-        break;
-      }
-    }
+    auto it = find_player(static_cast<Player*>(handle));
     if (it != g_mediahub_players.end()) {
       g_mediahub_players.erase(it);
     }

=== modified file 'shared/browser/media/mediahub_player_shim.h'
--- shared/browser/media/mediahub_player_shim.h	2015-01-16 23:12:06 +0000
+++ shared/browser/media/mediahub_player_shim.h	2015-02-17 14:23:15 +0000
@@ -15,7 +15,7 @@
 
   virtual void seeked_to(int64_t pos) = 0;
   virtual void end_of_stream() = 0;
-  virtual void playback_status_changed(Status status, int64_t duration) = 0;
+  virtual void playback_status_changed(Status status) = 0;
 };
 
 #if defined(__cplusplus)

=== modified file 'shared/browser/media/oxide_player_media_hub.cc'
--- shared/browser/media/oxide_player_media_hub.cc	2015-01-20 17:26:44 +0000
+++ shared/browser/media/oxide_player_media_hub.cc	2015-02-17 14:23:15 +0000
@@ -57,7 +57,9 @@
 
 MediaPlayerMediaHub::~MediaPlayerMediaHub() {
   timer_.Stop();
-  mediahub_stop(media_hub_client_);
+  if (!use_fixed_session_) {
+    mediahub_stop(media_hub_client_);
+  }
   mediahub_release(media_hub_client_);
 }
 
@@ -157,23 +159,23 @@
   manager_->OnPlaybackComplete(player_id());
 }
 
-void MediaPlayerMediaHub::playback_status_changed(MediaHubDelegate::Status status, int64_t duration) {
+void MediaPlayerMediaHub::playback_status_changed(MediaHubDelegate::Status status) {
   switch (status) {
   case null:
   case ready:
     manager_->OnMediaMetadataChanged(player_id(),
-                                      base::TimeDelta::FromMilliseconds(duration),
+                                      base::TimeDelta::FromMilliseconds(mediahub_get_duration(media_hub_client_)),
                                       0, 0, true);
     break;
   case playing:
     manager_->OnMediaMetadataChanged(player_id(),
-                                      base::TimeDelta::FromMilliseconds(duration),
+                                      base::TimeDelta::FromMilliseconds(mediahub_get_duration(media_hub_client_)),
                                       0, 0, true);
     manager_->OnPlayerPlay(player_id());
     break;
   case paused:
     manager_->OnMediaMetadataChanged(player_id(),
-                                      base::TimeDelta::FromMilliseconds(duration),
+                                      base::TimeDelta::FromMilliseconds(mediahub_get_duration(media_hub_client_)),
                                       0, 0, true);
     manager_->OnPlayerPause(player_id());
     break;

=== modified file 'shared/browser/media/oxide_player_media_hub.h'
--- shared/browser/media/oxide_player_media_hub.h	2015-01-20 17:26:44 +0000
+++ shared/browser/media/oxide_player_media_hub.h	2015-02-17 14:23:15 +0000
@@ -63,7 +63,7 @@
   // MediaHubDelegate
   void seeked_to(int64_t pos);
   void end_of_stream();
-  void playback_status_changed(MediaHubDelegate::Status status, int64_t duration);
+  void playback_status_changed(MediaHubDelegate::Status status);
 
  protected:
   void SetDuration(base::TimeDelta time);