lp:~justinmcp/oxide/external-media-player
Created by
Justin McPherson
and last modified
- Get this branch:
- bzr branch lp:~justinmcp/oxide/external-media-player
Only
Justin McPherson
can upload to this branch. If you are
Justin McPherson
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Chris Coulson: Pending requested
-
Diff: 3910 lines (+2413/-285) (has conflicts)42 files modifiedCMakeLists.txt (+8/-5)
qt/core/browser/oxide_qt_web_view.cc (+8/-0)
qt/core/browser/oxide_qt_web_view.h (+5/-0)
qt/core/glue/oxide_qt_web_view_proxy_client.h (+6/-0)
qt/quick/CMakeLists.txt (+1/-0)
qt/quick/api/oxideqmediaplayerbridge.cc (+214/-0)
qt/quick/api/oxideqmediaplayerbridge.h (+49/-0)
qt/quick/api/oxideqquickwebview.cc (+40/-0)
qt/quick/api/oxideqquickwebview_p.h (+7/-0)
qt/quick/api/oxideqquickwebview_p_p.h (+7/-0)
qt/tests/qmltests/api/tst_ExternalMediaPlayer.html (+5/-0)
qt/tests/qmltests/api/tst_ExternalMediaPlayer.qml (+176/-0)
shared/browser/media/mediahub_player_shim.cc (+256/-41)
shared/browser/media/mediahub_player_shim.h (+90/-94)
shared/browser/media/oxide_browser_media_player_manager.cc (+120/-37)
shared/browser/media/oxide_browser_media_player_manager.h (+6/-2)
shared/browser/media/oxide_external_player_bridge.h (+57/-0)
shared/browser/media/oxide_media_hub_thread.cc (+197/-0)
shared/browser/media/oxide_media_hub_thread.h (+99/-0)
shared/browser/media/oxide_media_player.cc (+4/-0)
shared/browser/media/oxide_media_player.h (+15/-0)
shared/browser/media/oxide_media_web_contents_observer.cc (+42/-5)
shared/browser/media/oxide_media_web_contents_observer.h (+5/-0)
shared/browser/media/oxide_player_external.cc (+209/-0)
shared/browser/media/oxide_player_external.h (+114/-0)
shared/browser/media/oxide_player_media_hub.cc (+113/-25)
shared/browser/media/oxide_player_media_hub.h (+22/-16)
shared/browser/oxide_browser_process_main.cc (+6/-0)
shared/browser/oxide_content_browser_client.cc (+6/-0)
shared/browser/oxide_web_view.cc (+10/-2)
shared/browser/oxide_web_view.h (+5/-0)
shared/browser/oxide_web_view_client.h (+4/-0)
shared/common/oxide_constants.cc (+1/-0)
shared/common/oxide_constants.h (+1/-0)
shared/common/oxide_messages.h (+11/-0)
shared/renderer/media/oxide_renderer_media_player_manager.cc (+10/-1)
shared/renderer/media/oxide_renderer_media_player_manager.h (+10/-2)
shared/renderer/media/oxide_web_media_player.cc (+358/-33)
shared/renderer/media/oxide_web_media_player.h (+72/-8)
shared/renderer/oxide_content_renderer_client.cc (+21/-5)
shared/renderer/oxide_content_renderer_client.h (+8/-5)
shared/shared.gyp (+15/-4)
Related source package recipes
Branch information
Recent revisions
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
