From 376c6ccbeb75017993eb8e85067a5780e969558e Mon Sep 17 00:00:00 2001 From: hjjang Date: Mon, 3 Jul 2017 18:06:54 +0900 Subject: [PATCH] Revert "Implement mediahub music player gui" This reverts commit 19402a1cc039f409761be9957a5bf212583bd546. Change-Id: I3cb96acfec96f83fb4c6014e5685c949b5f4ba90 --- .../TVMediaHub.Tizen/Models/MusicPlayerModel.cs | 36 +-------- .../TVMediaHub.Tizen/TVMediaHub.Tizen.csproj | 5 +- .../ViewModels/MusicPlayerViewModel.cs | 17 ----- TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml | 4 +- TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml | 32 +++----- .../TVMediaHub.Tizen/Views/MusicPlayer.xaml.cs | 82 +-------------------- TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml | 56 ++++++-------- TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs | 7 +- .../TVMediaHub.Tizen/res/btn_music_info_pause.png | Bin 2712 -> 0 bytes .../TVMediaHub.Tizen/res/btn_music_info_play.png | Bin 3555 -> 0 bytes .../res/img_music_list_focused_shadow.9.png | Bin 8225 -> 0 bytes 11 files changed, 47 insertions(+), 192 deletions(-) mode change 100644 => 100755 TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml delete mode 100644 TVMediaHub/TVMediaHub.Tizen/res/btn_music_info_pause.png delete mode 100644 TVMediaHub/TVMediaHub.Tizen/res/btn_music_info_play.png delete mode 100644 TVMediaHub/TVMediaHub.Tizen/res/img_music_list_focused_shadow.9.png diff --git a/TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs b/TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs index b38b31e..74c1294 100644 --- a/TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs +++ b/TVMediaHub/TVMediaHub.Tizen/Models/MusicPlayerModel.cs @@ -32,7 +32,6 @@ namespace TVMediaHub.Tizen.Models public string Title; public string Artist; public string AlbumCover; - public string AlbumName; } /// @@ -100,7 +99,7 @@ namespace TVMediaHub.Tizen.Models currentMusic = value; /// 1. Stop the player - if (playerInstance.State == PlayerState.Playing || playerInstance.State == PlayerState.Paused) + if (playerInstance.State == PlayerState.Playing) { StopPlayer(); } @@ -114,7 +113,6 @@ namespace TVMediaHub.Tizen.Models Title = (currentMusic.MediaContentInformation as AudioInformation).Title, Artist = (currentMusic.MediaContentInformation as AudioInformation).Artist, AlbumCover = ((currentMusic.MediaContentInformation as AudioInformation).ThumbnailPath.Length != 0) ? (currentMusic.MediaContentInformation as AudioInformation).ThumbnailPath : "img_media_no_contents.png", - AlbumName = (currentMusic.MediaContentInformation as AudioInformation).Album }); /// 4. Update the progressbar of the current music @@ -153,6 +151,7 @@ namespace TVMediaHub.Tizen.Models private void InitializePlayer() { playerInstance = new Player(); + playerInstance.PlaybackCompleted += ((s, e) => { StopPlayer(); @@ -223,37 +222,6 @@ namespace TVMediaHub.Tizen.Models } /// - /// Toggles pause and play the current music - /// - public void TogglePausePlay() - { - if (playerInstance.State == PlayerState.Playing) - { - try - { - playerInstance.Pause(); - } - catch (Exception e) - { - DbgPort.E("Error : " + e.Message); - } - StopProgressbarTimer(); - } - else if (playerInstance.State == PlayerState.Paused) - { - try - { - playerInstance.Start(); - } - catch (Exception e) - { - DbgPort.E("Error : " + e.Message); - } - StartProgressbarTimer(); - } - } - - /// /// Stops the current music /// public void StopPlayer() diff --git a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj index edff850..3f8a617 100755 --- a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj +++ b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj @@ -184,8 +184,6 @@ - - @@ -230,7 +228,6 @@ - @@ -368,4 +365,4 @@ - \ No newline at end of file + diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs index ee9d2d6..b4d39d9 100644 --- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs +++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/MusicPlayerViewModel.cs @@ -16,7 +16,6 @@ using System.ComponentModel; using TVMediaHub.Tizen.Models; -using Xamarin.Forms; namespace TVMediaHub.Tizen.ViewModels { @@ -41,17 +40,10 @@ namespace TVMediaHub.Tizen.ViewModels public string AlbumArtist { get; private set; } /// - /// The album name to be shown - /// - public string AlbumName { get; private set; } - - /// /// The album cover to be shown /// public string AlbumCover { get; private set; } - public Command MusicPlayerButtonClickCommand { get; private set; } - /// /// An event that is occurred when property of ViewModel is changed /// @@ -79,12 +71,6 @@ namespace TVMediaHub.Tizen.ViewModels AlbumTitle = "Title"; AlbumArtist = "Artist"; AlbumCover = "img_media_no_contents.png"; - AlbumName = "Album"; - - MusicPlayerButtonClickCommand = new Command(() => - { - MusicPlayerModel.Instance.TogglePausePlay(); - }); MusicPlayerModel.Instance.SetCurrentMusicInfoListener((e, args) => { @@ -101,9 +87,6 @@ namespace TVMediaHub.Tizen.ViewModels AlbumCover = args.AlbumCover; OnPropertyChanged("AlbumCover"); - - AlbumName = args.AlbumName; - OnPropertyChanged("AlbumName"); }); MusicPlayerModel.Instance.SetCurrentMusicProgressListener((e, arg) => diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml index 34277cc..1b9dbad 100644 --- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml +++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicGroup.xaml @@ -11,6 +11,6 @@ - + RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.085}"> + \ No newline at end of file diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml index ca8f177..3667788 100644 --- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml +++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicPlayer.xaml @@ -1,26 +1,18 @@  - - + - -