[CB-4127] remove dupe code (155284bb) · Commits · codevise / cordova-plugin-media

plugin.xml

+4 −4

Changes for plugin.xml: 4 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -64,8 +64,8 @@ id="org.apache.cordova.core.AudioHandler"
		<Capability Name="ID_CAP_MICROPHONE"/>
		</config-file>

		<source-file src="src/wp7/Media.cs" />
		<source-file src="src/wp7/AudioPlayer.cs" />
		<source-file src="src/wp/Media.cs" />
		<source-file src="src/wp/AudioPlayer.cs" />
		</platform>

		<!-- wp8 -->
		@@ -82,8 +82,8 @@ id="org.apache.cordova.core.AudioHandler"
		<Capability Name="ID_CAP_MICROPHONE"/>
		</config-file>

		<source-file src="src/wp8/Media.cs" />
		<source-file src="src/wp8/AudioPlayer.cs" />
		<source-file src="src/wp/Media.cs" />
		<source-file src="src/wp/AudioPlayer.cs" />
		</platform>

src/wp7/AudioPlayer.cs→src/wp/AudioPlayer.cs

+0 −0

File moved.

View file

src/wp8/Media.cs→src/wp/Media.cs

+0 −0

File moved.

View file

src/wp7/Media.cs

deleted100644 → 0

+0 −532

Changes for src/wp7/Media.cs: 0 added lines, 532 removed lines.
Original line number	Diff line number	Diff line
		/*
		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		*/

		using System;
		using System.Collections.Generic;
		using System.Runtime.Serialization;
		using System.Windows;
		using System.Diagnostics;

		namespace WPCordovaClassLib.Cordova.Commands
		{
		/// <summary>
		/// Provides the ability to record and play back audio files on a device.
		/// </summary>
		public class Media : BaseCommand
		{
		/// <summary>
		/// Audio player objects
		/// </summary>
		private static Dictionary<string, AudioPlayer> players = new Dictionary<string, AudioPlayer>();

		/// <summary>
		/// Represents Media action options.
		/// </summary>
		[DataContract]
		public class MediaOptions
		{
		/// <summary>
		/// Audio id
		/// </summary>
		[DataMember(Name = "id", IsRequired = true)]
		public string Id { get; set; }

		/// <summary>
		/// Path to audio file
		/// </summary>
		[DataMember(Name = "src")]
		public string Src { get; set; }

		/// <summary>
		/// New track position
		/// </summary>
		[DataMember(Name = "milliseconds")]
		public int Milliseconds { get; set; }
		}

		/// <summary>
		/// Releases the audio player instance to save memory.
		/// </summary>
		public void release(string options)
		{
		try
		{
		MediaOptions mediaOptions;

		try
		{
		string[] optionsString = JSON.JsonHelper.Deserialize<string[]>(options);
		mediaOptions = new MediaOptions();
		mediaOptions.Id = optionsString[0];
		}
		catch (Exception)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION));
		return;
		}

		if (!Media.players.ContainsKey(mediaOptions.Id))
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.OK, false));
		return;
		}

		Deployment.Current.Dispatcher.BeginInvoke(() =>
		{
		try
		{
		AudioPlayer audio = Media.players[mediaOptions.Id];
		Media.players.Remove(mediaOptions.Id);
		audio.Dispose();
		DispatchCommandResult(new PluginResult(PluginResult.Status.OK, true));
		}
		catch (Exception e)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, e.Message));
		}
		});
		}
		catch (Exception e)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, e.Message));
		}
		}

		/// <summary>
		/// Starts recording and save the specified file
		/// </summary>
		public void startRecordingAudio(string options)
		{
		try
		{
		MediaOptions mediaOptions;

		try
		{
		string[] optionsString = JSON.JsonHelper.Deserialize<string[]>(options);
		mediaOptions = new MediaOptions();
		mediaOptions.Id = optionsString[0];
		mediaOptions.Src = optionsString[1];
		}
		catch (Exception)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION));
		return;
		}

		if (mediaOptions != null)
		{

		Deployment.Current.Dispatcher.BeginInvoke(() =>
		{
		try
		{
		if (!Media.players.ContainsKey(mediaOptions.Id))
		{
		AudioPlayer audio = new AudioPlayer(this, mediaOptions.Id);
		Media.players.Add(mediaOptions.Id, audio);
		audio.startRecording(mediaOptions.Src);
		}
		DispatchCommandResult(new PluginResult(PluginResult.Status.OK));
		}
		catch (Exception e)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, e.Message));
		}

		});
		}
		else
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION));
		}
		}
		catch (Exception e)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, e.Message));
		}
		}

		/// <summary>
		/// Stops recording and save to the file specified when recording started
		/// </summary>
		public void stopRecordingAudio(string options)
		{
		try
		{
		string mediaId = JSON.JsonHelper.Deserialize<string[]>(options)[0];
		Deployment.Current.Dispatcher.BeginInvoke(() =>
		{
		try
		{
		if (Media.players.ContainsKey(mediaId))
		{
		AudioPlayer audio = Media.players[mediaId];
		audio.stopRecording();
		Media.players.Remove(mediaId);
		}
		DispatchCommandResult(new PluginResult(PluginResult.Status.OK));
		}
		catch (Exception e)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, e.Message));
		}
		});
		}
		catch (Exception)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION));
		}
		}

		public void setVolume(string options) // id,volume
		{
		try
		{
		string[] optionsString = JSON.JsonHelper.Deserialize<string[]>(options);
		string id = optionsString[0];
		double volume = double.Parse(optionsString[1]);

		if (Media.players.ContainsKey(id))
		{
		Deployment.Current.Dispatcher.BeginInvoke(() =>
		{
		try
		{
		AudioPlayer player = Media.players[id];
		player.setVolume(volume);
		}
		catch (Exception e)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, e.Message));
		}
		});
		}
		}
		catch (Exception)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION, "Error parsing options into setVolume method"));
		return;
		}
		}

		// Some Audio Notes:
		// In the Windows Phone Emulator, playback of video or audio content using the MediaElement control is not supported.
		// While playing, a MediaElement stops all other media playback on the phone.
		// Multiple MediaElement controls are NOT supported

		// Called when you create a new Media('blah') object in JS.
		public void create(string options)
		{
		// Debug.WriteLine("Creating Audio :: " + options);
		try
		{
		MediaOptions mediaOptions;
		try
		{
		string[] optionsString = JSON.JsonHelper.Deserialize<string[]>(options);
		mediaOptions = new MediaOptions();
		mediaOptions.Id = optionsString[0];
		mediaOptions.Src = optionsString[1];
		}
		catch (Exception)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION, "Error parsing options into create method"));
		return;
		}

		AudioPlayer audio = new AudioPlayer(this, mediaOptions.Id);
		Media.players.Add(mediaOptions.Id, audio);
		DispatchCommandResult(new PluginResult(PluginResult.Status.OK));

		}
		catch (Exception e)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, e.Message));
		}
		}

		/// <summary>
		/// Starts or resume playing audio file
		/// </summary>
		public void startPlayingAudio(string options)
		{
		try
		{
		MediaOptions mediaOptions;
		try
		{
		string[] optionsString = JSON.JsonHelper.Deserialize<string[]>(options);
		mediaOptions = new MediaOptions();
		mediaOptions.Id = optionsString[0];
		mediaOptions.Src = optionsString[1];
		if (optionsString.Length > 2 && optionsString[2] != null)
		{
		mediaOptions.Milliseconds = int.Parse(optionsString[2]);
		}

		}
		catch (Exception)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION));
		return;
		}

		AudioPlayer audio;

		if (!Media.players.ContainsKey(mediaOptions.Id))
		{
		audio = new AudioPlayer(this, mediaOptions.Id);
		Media.players[mediaOptions.Id] = audio;
		}
		else
		{
		Debug.WriteLine("INFO: startPlayingAudio FOUND mediaPlayer for " + mediaOptions.Id);
		audio = Media.players[mediaOptions.Id];
		}

		Deployment.Current.Dispatcher.BeginInvoke(() =>
		{
		try
		{
		audio.startPlaying(mediaOptions.Src);
		DispatchCommandResult(new PluginResult(PluginResult.Status.OK));
		}
		catch (Exception e)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, e.Message));
		}
		});
		}
		catch (Exception e)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, e.Message));
		}
		}


		/// <summary>
		/// Seeks to a location
		/// </summary>
		public void seekToAudio(string options)
		{
		try
		{
		MediaOptions mediaOptions;

		try
		{
		string[] optionsString = JSON.JsonHelper.Deserialize<string[]>(options);
		mediaOptions = new MediaOptions();
		mediaOptions.Id = optionsString[0];
		if (optionsString.Length > 1 && optionsString[1] != null)
		{
		mediaOptions.Milliseconds = int.Parse(optionsString[1]);
		}
		}
		catch (Exception)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION));
		return;
		}

		Deployment.Current.Dispatcher.BeginInvoke(() =>
		{
		try
		{
		if (Media.players.ContainsKey(mediaOptions.Id))
		{
		AudioPlayer audio = Media.players[mediaOptions.Id];
		audio.seekToPlaying(mediaOptions.Milliseconds);
		}
		else
		{
		Debug.WriteLine("ERROR: seekToAudio could not find mediaPlayer for " + mediaOptions.Id);
		}

		DispatchCommandResult(new PluginResult(PluginResult.Status.OK));
		}
		catch (Exception e)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, e.Message));
		}
		});
		}
		catch (Exception e)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, e.Message));
		}
		}

		/// <summary>
		/// Pauses playing
		/// </summary>
		public void pausePlayingAudio(string options)
		{

		try
		{
		string mediaId = JSON.JsonHelper.Deserialize<string[]>(options)[0];

		Deployment.Current.Dispatcher.BeginInvoke(() =>
		{
		try
		{
		if (Media.players.ContainsKey(mediaId))
		{
		AudioPlayer audio = Media.players[mediaId];
		audio.pausePlaying();
		}
		else
		{
		Debug.WriteLine("ERROR: pausePlayingAudio could not find mediaPlayer for " + mediaId);
		}

		DispatchCommandResult(new PluginResult(PluginResult.Status.OK));
		}
		catch (Exception e)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, e.Message));
		}
		});


		}
		catch (Exception)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION));
		}


		}


		/// <summary>
		/// Stops playing the audio file
		/// </summary>
		public void stopPlayingAudio(String options)
		{
		try
		{
		string mediaId = JSON.JsonHelper.Deserialize<string[]>(options)[0];
		Deployment.Current.Dispatcher.BeginInvoke(() =>
		{
		try
		{
		if (Media.players.ContainsKey(mediaId))
		{
		AudioPlayer audio = Media.players[mediaId];
		audio.stopPlaying();
		}
		else
		{
		Debug.WriteLine("stopPlaying could not find mediaPlayer for " + mediaId);
		}

		DispatchCommandResult(new PluginResult(PluginResult.Status.OK));
		}
		catch (Exception e)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, e.Message));
		}
		});

		}
		catch (Exception)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION));
		}
		}

		/// <summary>
		/// Gets current position of playback
		/// </summary>
		public void getCurrentPositionAudio(string options)
		{
		try
		{
		string mediaId = JSON.JsonHelper.Deserialize<string[]>(options)[0];
		Deployment.Current.Dispatcher.BeginInvoke(() =>
		{
		try
		{
		if (Media.players.ContainsKey(mediaId))
		{
		AudioPlayer audio = Media.players[mediaId];
		DispatchCommandResult(new PluginResult(PluginResult.Status.OK, audio.getCurrentPosition()));
		}
		else
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.OK, -1));
		}
		}
		catch (Exception e)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, e.Message));
		}
		});
		}
		catch (Exception)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION));
		return;
		}
		}


		/// <summary>
		/// Gets the duration of the audio file
		/// </summary>

		[Obsolete("This method will be removed shortly")]
		public void getDurationAudio(string options)
		{
		try
		{
		MediaOptions mediaOptions;

		try
		{
		mediaOptions = JSON.JsonHelper.Deserialize<MediaOptions>(options);
		}
		catch (Exception)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION));
		return;
		}

		AudioPlayer audio;
		if (Media.players.ContainsKey(mediaOptions.Id))
		{
		audio = Media.players[mediaOptions.Id];
		}
		else
		{
		Debug.WriteLine("ERROR: getDurationAudio could not find mediaPlayer for " + mediaOptions.Id);
		audio = new AudioPlayer(this, mediaOptions.Id);
		Media.players.Add(mediaOptions.Id, audio);
		}

		Deployment.Current.Dispatcher.BeginInvoke(() =>
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.OK, audio.getDuration(mediaOptions.Src)));
		});
		}
		catch (Exception e)
		{
		DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, e.Message));
		}
		}
		}
		}

src/wp8/AudioPlayer.cs

deleted100644 → 0

+0 −647

File deleted.

Preview size limit exceeded, changes collapsed.