From 3e70346ff5311c75a725793773ab7cbb9bcd78ee Mon Sep 17 00:00:00 2001
From: Ravi Kiran K N <ravi.kiran@samsung.com>
Date: Fri, 20 May 2016 11:54:18 +0530
Subject: [PATCH] AudioEffect: Get equalizer bands from Interop Removed
 deprecated API and Enum value

Change-Id: If869c836dc83178a642468fd85e76a5c7296bbe4
Signed-off-by: Ravi Kiran K N <ravi.kiran@samsung.com>
---
 src/Tizen.Multimedia/Interop/Interop.Player.cs |  3 ---
 src/Tizen.Multimedia/Player/AudioEffect.cs     | 36 ++++++++++++++++++++++++++
 src/Tizen.Multimedia/Player/EqualizerBand.cs   |  2 +-
 src/Tizen.Multimedia/Player/Player.cs          | 31 ----------------------
 src/Tizen.Multimedia/Player/PlayerEnums.cs     |  4 ---
 5 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/src/Tizen.Multimedia/Interop/Interop.Player.cs b/src/Tizen.Multimedia/Interop/Interop.Player.cs
index 72c2d31..510c260 100644
--- a/src/Tizen.Multimedia/Interop/Interop.Player.cs
+++ b/src/Tizen.Multimedia/Interop/Interop.Player.cs
@@ -88,9 +88,6 @@ internal static partial class Interop
 	[DllImport(Libraries.Player, EntryPoint = "player_get_volume")]
 	internal static extern int  GetVolume(IntPtr player, out float left, out float right);
 
-	[DllImport(Libraries.Player, EntryPoint = "player_set_sound_type")]
-	internal static extern int  SetSoundType(IntPtr player, int type);
-
 	[DllImport(Libraries.Player, EntryPoint = "player_set_audio_policy_info")]
 	internal static extern int  SetAudioPolicyInfo(IntPtr player, IntPtr stream_info);
 
diff --git a/src/Tizen.Multimedia/Player/AudioEffect.cs b/src/Tizen.Multimedia/Player/AudioEffect.cs
index 4f28e99..076cc02 100644
--- a/src/Tizen.Multimedia/Player/AudioEffect.cs
+++ b/src/Tizen.Multimedia/Player/AudioEffect.cs
@@ -48,6 +48,42 @@ namespace Tizen.Multimedia
 			}
 			get
 			{
+				int ret;
+				int count = 0, level = 0, frequency = 0, range = 0;
+				_bands.Clear();
+
+				ret = Interop.Player.AudioEffectGetEqualizerBandsCount(_playerHandle, out count);
+				if(ret == (int)PlayerError.None) 
+				{
+					for(int idx = 0; idx < count; idx++)
+					{
+						ret = Interop.Player.AudioEffectGetEqualizerBandLevel(_playerHandle, idx, out level);
+						if(ret != (int)PlayerError.None)
+						{
+							Log.Error(PlayerLog.LogTag, "Failed to get equalizer band level");
+						}
+
+						ret = Interop.Player.AudioEffectGetEqualizerBandFrequency(_playerHandle, idx, out frequency);
+						if(ret != (int)PlayerError.None)
+						{
+							Log.Error(PlayerLog.LogTag, "Failed to get equalizer band frequency");
+						}
+
+						ret = Interop.Player.AudioEffectGetEqualizerBandFrequencyRange(_playerHandle, idx, out range);
+						if(ret != (int)PlayerError.None)
+						{
+							Log.Error(PlayerLog.LogTag, "Failed to get equalizer band frequency range");
+						}
+
+						EqualizerBand band = new EqualizerBand(level, frequency, range);
+						_bands.Add(band);
+					}
+				} 
+				else 
+				{
+					Log.Error(PlayerLog.LogTag, "Failed to get equalizer band count");
+				}
+
 				return _bands;
 			}
 		}
diff --git a/src/Tizen.Multimedia/Player/EqualizerBand.cs b/src/Tizen.Multimedia/Player/EqualizerBand.cs
index 68ce044..146e1ba 100644
--- a/src/Tizen.Multimedia/Player/EqualizerBand.cs
+++ b/src/Tizen.Multimedia/Player/EqualizerBand.cs
@@ -62,7 +62,7 @@ namespace Tizen.Multimedia
             }
         }
 
-		internal EqualizerBand()
+		internal EqualizerBand(int level, int frequency, int range)
 		{
 		}
 
diff --git a/src/Tizen.Multimedia/Player/Player.cs b/src/Tizen.Multimedia/Player/Player.cs
index 96a33aa..cd2f614 100644
--- a/src/Tizen.Multimedia/Player/Player.cs
+++ b/src/Tizen.Multimedia/Player/Player.cs
@@ -405,37 +405,6 @@ namespace Tizen.Multimedia
         }
 
         /// <summary>
-        /// Set/Get sound type.
-        /// </summary>
-        /// <value> System, Notification, Alarm, Ringtone, Media, Call, Voip, Voice </value>
-		// TODO: Uncomment this once sound-manager changes are checked in
-		#if _SM_AUDIO_TYPE_
-        public AudioType PlayerAudioType 
-		{
-			set
-			{
-				if(_audioType != value) 
-				{
-					int ret = Interop.Player.SetSoundType(_playerHandle, (int)value);
-					if(ret != (int)PlayerError.None) {
-						Log.Error(PlayerLog.LogTag, "Set audio type failed" + (PlayerError)ret);
-						PlayerErrorFactory.ThrowException(ret, "set audio type failed");
-					} 
-					else 
-					{
-						_audioType = value;
-					}
-				}
-
-			}
-			get
-			{
-				return _audioType;
-			}
-		}
-		#endif
-
-        /// <summary>
         /// Get play position.
         /// </summary>
         /// <value> play position in milli seconds </value>
diff --git a/src/Tizen.Multimedia/Player/PlayerEnums.cs b/src/Tizen.Multimedia/Player/PlayerEnums.cs
index 431e45e..37f1b35 100644
--- a/src/Tizen.Multimedia/Player/PlayerEnums.cs
+++ b/src/Tizen.Multimedia/Player/PlayerEnums.cs
@@ -135,10 +135,6 @@ namespace Tizen.Multimedia
         /// </summary>
         OriginalOrFull,
 
-        /// <summary>
-        /// Dst ROI mode  
-        /// </summary>
-        DstRoi
     }
 
 
-- 
2.7.4