[Android] Medialibrary: move MediaWrapper to AMediaWrapper

Duncan McNamara git at videolan.org
Fri Jun 28 09:26:18 CEST 2019


vlc-android | branch: master | Duncan McNamara <dcn.mcnamara at gmail.com> | Thu Jun  6 10:23:29 2019 +0200| [31f61415ac837a10f21d538036ebd01079e83cad] | committer: Duncan McNamara

Medialibrary: move MediaWrapper to AMediaWrapper

> https://code.videolan.org/videolan/vlc-android/commit/31f61415ac837a10f21d538036ebd01079e83cad
---

 medialibrary/build.gradle                          |   2 +
 medialibrary/jni/medialibrary.cpp                  |  72 +-
 .../org/videolan/medialibrary/Medialibrary.java    | 108 +--
 .../org/videolan/medialibrary/ServiceLocator.java  |  89 +++
 .../src/org/videolan/medialibrary/Tools.java       |  12 +-
 .../interfaces/media/AMediaWrapper.java            | 742 +++++++++++++++++++++
 .../src/org/videolan/medialibrary/media/Album.java |  15 +-
 .../org/videolan/medialibrary/media/Artist.java    |  15 +-
 .../org/videolan/medialibrary/media/DummyItem.java |   3 +-
 .../org/videolan/medialibrary/media/Folder.java    |  15 +-
 .../src/org/videolan/medialibrary/media/Genre.java |  15 +-
 .../videolan/medialibrary/media/HistoryItem.java   |  14 +-
 .../medialibrary/media/MediaLibraryItem.java       |  10 +-
 .../videolan/medialibrary/media/MediaWrapper.java  | 590 +---------------
 .../org/videolan/medialibrary/media/Playlist.java  |  13 +-
 .../medialibrary/media/SearchAggregate.java        |  15 +-
 .../org/videolan/medialibrary/media/Storage.java   |   3 +-
 .../medialibrary/stubs/StubMediaWrapper.java       |  73 ++
 vlc-android/build.gradle                           |   8 +
 vlc-android/proguard.cfg                           |   2 +-
 vlc-android/res/layout/history_item.xml            |   4 +-
 vlc-android/res/layout/playlist_item.xml           |   2 +-
 vlc-android/res/layout/tv_simple_list_item.xml     |   2 +-
 vlc-android/res/layout/video_grid_card.xml         |   2 +-
 vlc-android/res/layout/video_list_card.xml         |   2 +-
 .../src/org/videolan/vlc/MediaSessionCallback.kt   |   4 +-
 .../src/org/videolan/vlc/PlaybackService.kt        |  32 +-
 .../src/org/videolan/vlc/RecommendationsService.kt |   6 +-
 .../vlc/extensions/ExtensionManagerService.java    |   5 +-
 .../src/org/videolan/vlc/extensions/Utils.java     |   7 +-
 .../src/org/videolan/vlc/gui/DialogActivity.kt     |   4 +-
 .../src/org/videolan/vlc/gui/HistoryAdapter.kt     |   6 +-
 .../src/org/videolan/vlc/gui/HistoryFragment.kt    |  10 +-
 .../src/org/videolan/vlc/gui/InfoActivity.kt       |  18 +-
 .../src/org/videolan/vlc/gui/PlaylistActivity.kt   |  18 +-
 .../src/org/videolan/vlc/gui/PlaylistFragment.kt   |   4 +-
 .../vlc/gui/audio/AudioAlbumsSongsFragment.kt      |   4 +-
 .../videolan/vlc/gui/audio/AudioBrowserFragment.kt |   8 +-
 .../src/org/videolan/vlc/gui/audio/AudioPlayer.kt  |  10 +-
 .../org/videolan/vlc/gui/audio/BaseAudioBrowser.kt |  28 +-
 .../org/videolan/vlc/gui/audio/PlaylistAdapter.kt  |  14 +-
 .../videolan/vlc/gui/browser/BaseBrowserAdapter.kt |  22 +-
 .../vlc/gui/browser/BaseBrowserFragment.kt         |  64 +-
 .../videolan/vlc/gui/browser/ExtensionAdapter.kt   |  17 +-
 .../videolan/vlc/gui/browser/ExtensionBrowser.kt   |   6 +-
 .../vlc/gui/browser/FileBrowserFragment.kt         |  11 +-
 .../videolan/vlc/gui/browser/FilePickerAdapter.kt  |   4 +-
 .../videolan/vlc/gui/browser/FilePickerFragment.kt |  11 +-
 .../vlc/gui/browser/MediaBrowserFragment.kt        |   9 +-
 .../vlc/gui/browser/NetworkBrowserFragment.kt      |   6 +-
 .../org/videolan/vlc/gui/browser/PathAdapter.kt    |   4 +-
 .../vlc/gui/browser/StorageBrowserAdapter.kt       |   4 +-
 .../vlc/gui/browser/StorageBrowserFragment.kt      |   9 +-
 .../vlc/gui/dialogs/NetworkServerDialog.kt         |   4 +-
 .../videolan/vlc/gui/dialogs/SavePlaylistDialog.kt |  12 +-
 .../src/org/videolan/vlc/gui/helpers/AudioUtil.kt  |  20 +-
 .../src/org/videolan/vlc/gui/helpers/BitmapUtil.kt |   8 +-
 .../org/videolan/vlc/gui/helpers/ImageLoader.kt    |  14 +-
 .../videolan/vlc/gui/helpers/MediaComparators.kt   |   4 +-
 .../src/org/videolan/vlc/gui/helpers/UiTools.kt    |  17 +-
 .../org/videolan/vlc/gui/helpers/hf/OtgAccess.kt   |  15 +-
 .../src/org/videolan/vlc/gui/network/MRLAdapter.kt |  10 +-
 .../videolan/vlc/gui/network/MRLPanelFragment.kt   |  18 +-
 .../src/org/videolan/vlc/gui/tv/CardPresenter.kt   |  24 +-
 .../org/videolan/vlc/gui/tv/FileTvItemAdapter.kt   |  14 +-
 .../src/org/videolan/vlc/gui/tv/MainTvFragment.kt  |  10 +-
 .../vlc/gui/tv/MediaItemDetailsFragment.kt         |  15 +-
 .../org/videolan/vlc/gui/tv/MediaTvItemAdapter.kt  |   6 +-
 .../src/org/videolan/vlc/gui/tv/SearchFragment.kt  |   3 +-
 vlc-android/src/org/videolan/vlc/gui/tv/TvUtil.kt  |  68 +-
 .../vlc/gui/tv/audioplayer/AudioPlayerActivity.kt  |   8 +-
 .../vlc/gui/tv/audioplayer/PlaylistAdapter.kt      |   4 +-
 .../vlc/gui/tv/browser/BaseBrowserTvFragment.kt    |   6 +-
 .../vlc/gui/tv/browser/CategoriesFragment.kt       |   8 +-
 .../vlc/gui/tv/browser/DirectoryBrowserFragment.kt |   4 +-
 .../vlc/gui/tv/browser/FileBrowserTvFragment.kt    |  12 +-
 .../vlc/gui/tv/browser/MediaBrowserTvFragment.kt   |   4 +-
 .../vlc/gui/tv/browser/NetworkBrowserFragment.kt   |   4 +-
 .../vlc/gui/tv/browser/VerticalGridActivity.kt     |   6 +-
 .../src/org/videolan/vlc/gui/video/PopupManager.kt |   4 +-
 .../videolan/vlc/gui/video/VideoGridFragment.kt    |  62 +-
 .../org/videolan/vlc/gui/video/VideoListAdapter.kt |  24 +-
 .../videolan/vlc/gui/video/VideoPlayerActivity.kt  |  45 +-
 .../src/org/videolan/vlc/media/MediaGroup.kt       | 108 ---
 .../videolan/vlc/media/MediaSessionBrowser.java    |   8 +-
 .../src/org/videolan/vlc/media/MediaUtils.kt       |  58 +-
 .../src/org/videolan/vlc/media/MediaWrapperList.kt |  30 +-
 .../src/org/videolan/vlc/media/PlayerController.kt |   6 +-
 .../src/org/videolan/vlc/media/PlaylistManager.kt  |  94 +--
 .../org/videolan/vlc/providers/BrowserProvider.kt  |  30 +-
 .../videolan/vlc/providers/FileBrowserProvider.kt  |  15 +-
 .../videolan/vlc/providers/FilePickerProvider.kt   |   4 +-
 .../org/videolan/vlc/providers/NetworkProvider.kt  |   8 +-
 .../org/videolan/vlc/providers/StorageProvider.kt  |   4 +-
 .../vlc/providers/medialibrary/TracksProvider.kt   |   7 +-
 .../vlc/providers/medialibrary/VideosProvider.kt   |   8 +-
 .../vlc/repository/BrowserFavRepository.kt         |   8 +-
 .../videolan/vlc/repository/DirectoryRepository.kt |   9 +-
 .../org/videolan/vlc/repository/SlaveRepository.kt |   4 +-
 .../src/org/videolan/vlc/util/Browserutils.kt      |   7 +-
 vlc-android/src/org/videolan/vlc/util/FileUtils.kt |   4 +-
 .../src/org/videolan/vlc/util/FilterDelegate.kt    |   8 +-
 .../src/org/videolan/vlc/util/Kextensions.kt       |  18 +-
 .../src/org/videolan/vlc/util/ModelsHelper.kt      |  21 +-
 .../org/videolan/vlc/util/ThumbnailsProvider.kt    |  25 +-
 .../src/org/videolan/vlc/util/TvChannels.kt        |   6 +-
 vlc-android/src/org/videolan/vlc/util/Util.kt      |   4 +-
 .../src/org/videolan/vlc/util/VLCOptions.kt        |  10 +-
 .../org/videolan/vlc/viewmodels/HistoryModel.kt    |   6 +-
 .../org/videolan/vlc/viewmodels/PlaylistModel.kt   |  16 +-
 .../org/videolan/vlc/viewmodels/StreamsModel.kt    |   4 +-
 .../vlc/viewmodels/browser/BrowserModel.kt         |  22 +-
 .../org/videolan/vlc/viewmodels/tv/MainTvModel.kt  |  10 +-
 113 files changed, 1761 insertions(+), 1427 deletions(-)

Diff:   https://code.videolan.org/videolan/vlc-android/commit/31f61415ac837a10f21d538036ebd01079e83cad


More information about the Android mailing list