keb/MpcNET
1
0
Fork 0
mirror of https://github.com/ZetaKebab/MpcNET.git synced 2025-01-14 22:18:43 +00:00
Code Issues Projects Releases Wiki Activity

Mpc use now EventHandler

Browse Source
This commit is contained in:
glucaci 2016-11-30 12:59:26 +01:00
parent 404ce3101a
commit e923d06984
2 changed files with 1318 additions and 1336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

244
LibMpc/Mpc.cs
View File

@ -1,19 +1,27 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
namespace Libmpc namespace Libmpc
{ {
/// <summary> public interface IMpc
/// The delegate for the <see cref="MpcConnection.OnConnected"/> and <see cref="MpcConnection.OnDisconnected"/> events. {
/// </summary> bool IsConnected { get; }
/// <param name="connection">The connection firing the event.</param> bool Connect();
public delegate void MpcEventDelegate(Mpc connection);
event EventHandler Connected;
event EventHandler Disconnected;
MpdOutput[] Outputs();
MpdStatistics Stats();
}
/// <summary> /// <summary>
/// The Mpc class implements all commands for the MPD. It takes care of command building /// The Mpc class implements all commands for the MPD. It takes care of command building
/// and parsing the response into .net objects. /// and parsing the response into .net objects.
/// </summary> /// </summary>
public class Mpc public class Mpc : IMpc
{ {
private const string TAG_ANY = "any"; private const string TAG_ANY = "any";
private const string TAG_FILENAME = "filename"; private const string TAG_FILENAME = "filename";
@ -32,84 +40,66 @@ namespace Libmpc
private static readonly Regex STATUS_AUDIO_REGEX = new Regex("^(?<sampleRate>[0-9]*):(?<bits>[0-9]*):(?<channels>[0-9]*)$"); private static readonly Regex STATUS_AUDIO_REGEX = new Regex("^(?<sampleRate>[0-9]*):(?<bits>[0-9]*):(?<channels>[0-9]*)$");
private readonly MpcConnectionEventDelegate onMpcConnectionConnectedDelegate; private MpcConnection _connection;
private readonly MpcConnectionEventDelegate onMpcConnectionDisconnectedDelegate; private IPEndPoint _server;
private MpcConnection connection = null; public Mpc(IPEndPoint server)
/// <summary>
/// Creates a new Mpc.
/// </summary>
public Mpc()
{ {
this.onMpcConnectionConnectedDelegate = new MpcConnectionEventDelegate(this.onMpcConnectionConnected); _server = server;
this.onMpcConnectionDisconnectedDelegate = new MpcConnectionEventDelegate(this.onMpcConnectionDisconnected);
} }
/// <summary> /// <summary>
/// Is fired when a connection to a MPD server is established. /// Is fired when a connection to a MPD server is established.
/// </summary> /// </summary>
public event MpcEventDelegate OnConnected; public event EventHandler Connected
{
add { ConnectedRelayEvent += value; }
remove { ConnectedRelayEvent -= value; }
}
private event EventHandler ConnectedRelayEvent;
/// <summary> /// <summary>
/// Is fired when the connection to the MPD server is closed. /// Is fired when the connection to the MPD server is closed.
/// </summary> /// </summary>
public event MpcEventDelegate OnDisconnected; public event EventHandler Disconnected
{
add { DisconnectedRelayEvent += value; }
remove { DisconnectedRelayEvent -= value; }
}
private event EventHandler DisconnectedRelayEvent;
/// <summary> /// <summary>
/// If the Mpc object has a connection that is connected to an MPD. /// Connection status to MPD Server.
/// </summary> /// </summary>
public bool Connected public bool IsConnected => _connection?.IsConnected ?? false;
{
get { return this.connection == null ? false : this.connection.Connected; }
}
/// <summary>
/// The MpcConnection used to talk to the server.
/// </summary>
public MpcConnection Connection
{
get { return this.connection; }
set
{
if (this.connection != null)
{
this.connection.OnConnected -= this.onMpcConnectionConnectedDelegate;
this.connection.OnDisconnected -= this.onMpcConnectionDisconnectedDelegate;
if (this.connection.Connected) public bool Connect()
this.onMpcConnectionDisconnected( this.connection ); {
if (_connection == null)
{
_connection = new MpcConnection(_server);
_connection.Connected += OnConnected;
_connection.Disconnected += OnDisconnected;
} }
this.connection = value; if (!_connection.IsConnected)
if (this.connection != null)
{ {
this.connection.OnConnected += this.onMpcConnectionConnectedDelegate; _connection.Connect();
this.connection.OnDisconnected += this.onMpcConnectionDisconnectedDelegate;
if (this.connection.Connected)
this.onMpcConnectionConnected(this.connection);
}
}
} }
private MpcConnection getConnection() return _connection.IsConnected;
}
private void OnConnected(object sender, EventArgs e)
{ {
MpcConnection ret = this.connection; ConnectedRelayEvent?.Invoke(this, e);
if (ret == null)
throw new NotConnectedException();
else
return ret;
} }
private void OnDisconnected(object sender, EventArgs e)
private void onMpcConnectionConnected(MpcConnection connection)
{ {
if (this.OnConnected != null) DisconnectedRelayEvent?.Invoke(this, e);
this.OnConnected.Invoke(this);
}
private void onMpcConnectionDisconnected(MpcConnection connection)
{
if (this.OnDisconnected != null)
this.OnDisconnected.Invoke(this);
} }
#region Admin Commands #region Admin Commands
@ -120,7 +110,7 @@ namespace Libmpc
/// <returns>If the action was successful.</returns> /// <returns>If the action was successful.</returns>
public bool DisableOutput(int id) public bool DisableOutput(int id)
{ {
return !this.getConnection().Exec("disableoutput", new string[] { id.ToString() }).IsError; return !_connection.Exec("disableoutput", new string[] { id.ToString() }).IsError;
} }
/// <summary> /// <summary>
/// Enables an MPD output. /// Enables an MPD output.
@ -129,7 +119,7 @@ namespace Libmpc
/// <returns>If the action was successful.</returns> /// <returns>If the action was successful.</returns>
public bool EnableOutput(int id) public bool EnableOutput(int id)
{ {
return !this.getConnection().Exec("enableoutput", new string[] { id.ToString() }).IsError; return !_connection.Exec("enableoutput", new string[] { id.ToString() }).IsError;
} }
/// <summary> /// <summary>
/// Lists all outputs of the MPD. /// Lists all outputs of the MPD.
@ -137,7 +127,7 @@ namespace Libmpc
/// <returns>The list of all MPD outputs.</returns> /// <returns>The list of all MPD outputs.</returns>
public MpdOutput[] Outputs() public MpdOutput[] Outputs()
{ {
MpdResponse response = this.getConnection().Exec("outputs"); MpdResponse response = _connection.Exec("outputs");
if (response.Message.Count % 3 != 0) if (response.Message.Count % 3 != 0)
throw new InvalidMpdResponseException(); throw new InvalidMpdResponseException();
@ -183,7 +173,7 @@ namespace Libmpc
/// <returns>The list of tag types the MPD supports.</returns> /// <returns>The list of tag types the MPD supports.</returns>
public string[] TagTypes() public string[] TagTypes()
{ {
MpdResponse response = this.getConnection().Exec("tagtypes"); MpdResponse response = _connection.Exec("tagtypes");
string[] ret = new string[response.Message.Count]; string[] ret = new string[response.Message.Count];
@ -203,7 +193,7 @@ namespace Libmpc
/// <returns>An sequential number of the update process.</returns> /// <returns>An sequential number of the update process.</returns>
public int Update() public int Update()
{ {
MpdResponse response = this.getConnection().Exec("update"); MpdResponse response = _connection.Exec("update");
if (response.Message.Count != 1) if (response.Message.Count != 1)
throw new InvalidMpdResponseException("Respose message has more than one line."); throw new InvalidMpdResponseException("Respose message has more than one line.");
@ -233,7 +223,7 @@ namespace Libmpc
if (token == null) if (token == null)
throw new ArgumentNullException("token"); throw new ArgumentNullException("token");
MpdResponse response = this.getConnection().Exec("find", new string[] { this.toTag(scopeSpecifier), token }); MpdResponse response = _connection.Exec("find", new string[] { toTag(scopeSpecifier), token });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -247,7 +237,7 @@ namespace Libmpc
/// <returns>All values found in files of the MPD for the given attribute.</returns> /// <returns>All values found in files of the MPD for the given attribute.</returns>
public List<string> List(ScopeSpecifier scopeSpecifier) public List<string> List(ScopeSpecifier scopeSpecifier)
{ {
MpdResponse response = this.getConnection().Exec("list", new string[] { this.toTag(scopeSpecifier) }); MpdResponse response = _connection.Exec("list", new string[] { toTag(scopeSpecifier) });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -266,7 +256,7 @@ namespace Libmpc
if (searchValue == null) if (searchValue == null)
throw new ArgumentNullException("searchValue"); throw new ArgumentNullException("searchValue");
MpdResponse response = this.getConnection().Exec("list", new string[] { this.toTag(resultTag), this.toTag(searchTag), searchValue }); MpdResponse response = _connection.Exec("list", new string[] { toTag(resultTag), toTag(searchTag), searchValue });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -283,7 +273,7 @@ namespace Libmpc
if (path == null) if (path == null)
throw new ArgumentNullException("path"); throw new ArgumentNullException("path");
MpdResponse response = this.getConnection().Exec("listall", new string[] { path }); MpdResponse response = _connection.Exec("listall", new string[] { path });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -300,7 +290,7 @@ namespace Libmpc
if (path == null) if (path == null)
throw new ArgumentNullException("path"); throw new ArgumentNullException("path");
MpdResponse response = this.getConnection().Exec("listallinfo", new string[] { path }); MpdResponse response = _connection.Exec("listallinfo", new string[] { path });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -313,7 +303,7 @@ namespace Libmpc
/// <returns>The listing of the root directory.</returns> /// <returns>The listing of the root directory.</returns>
public MpdDirectoryListing LsInfo() public MpdDirectoryListing LsInfo()
{ {
return this.LsInfo(null); return LsInfo(null);
} }
/// <summary> /// <summary>
/// Returns the directory listing of the given path. /// Returns the directory listing of the given path.
@ -324,9 +314,9 @@ namespace Libmpc
{ {
MpdResponse response; MpdResponse response;
if (path == null) if (path == null)
response = this.getConnection().Exec("lsinfo"); response = _connection.Exec("lsinfo");
else else
response = this.getConnection().Exec("lsinfo", new string[] { path }); response = _connection.Exec("lsinfo", new string[] { path });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -347,7 +337,7 @@ namespace Libmpc
if (token == null) if (token == null)
throw new ArgumentNullException("token"); throw new ArgumentNullException("token");
MpdResponse response = this.getConnection().Exec("search", new string[] { this.toTag(scopeSpecifier), token }); MpdResponse response = _connection.Exec("search", new string[] { toTag(scopeSpecifier), token });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -367,7 +357,7 @@ namespace Libmpc
if (filename == null) if (filename == null)
throw new ArgumentNullException("filename"); throw new ArgumentNullException("filename");
MpdResponse response = this.getConnection().Exec("add", new string[] { filename }); MpdResponse response = _connection.Exec("add", new string[] { filename });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -382,7 +372,7 @@ namespace Libmpc
if (filename == null) if (filename == null)
throw new ArgumentNullException("filename"); throw new ArgumentNullException("filename");
MpdResponse response = this.getConnection().Exec("add", new string[] { filename }); MpdResponse response = _connection.Exec("add", new string[] { filename });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -404,7 +394,7 @@ namespace Libmpc
/// </summary> /// </summary>
public void Clear() public void Clear()
{ {
MpdResponse response = this.getConnection().Exec("clear"); MpdResponse response = _connection.Exec("clear");
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -415,7 +405,7 @@ namespace Libmpc
/// <returns>The information of the current song.</returns> /// <returns>The information of the current song.</returns>
public MpdFile CurrentSong() public MpdFile CurrentSong()
{ {
MpdResponse response = this.getConnection().Exec("currentsong"); MpdResponse response = _connection.Exec("currentsong");
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -428,7 +418,7 @@ namespace Libmpc
/// <param name="nr">The index of the track to remove from the playlist.</param> /// <param name="nr">The index of the track to remove from the playlist.</param>
public void Delete(int nr) public void Delete(int nr)
{ {
MpdResponse response = this.getConnection().Exec("delete", new string[] { nr.ToString() }); MpdResponse response = _connection.Exec("delete", new string[] { nr.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -439,7 +429,7 @@ namespace Libmpc
/// <param name="id">The id of the track to remove from the playlist.</param> /// <param name="id">The id of the track to remove from the playlist.</param>
public void DeleteId(int id) public void DeleteId(int id)
{ {
MpdResponse response = this.getConnection().Exec("deleteid", new string[] { id.ToString() }); MpdResponse response = _connection.Exec("deleteid", new string[] { id.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -453,7 +443,7 @@ namespace Libmpc
if (name == null) if (name == null)
throw new ArgumentNullException("name"); throw new ArgumentNullException("name");
MpdResponse response = this.getConnection().Exec("load", new string[] { name }); MpdResponse response = _connection.Exec("load", new string[] { name });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -470,7 +460,7 @@ namespace Libmpc
if (newName == null) if (newName == null)
throw new ArgumentNullException("newName"); throw new ArgumentNullException("newName");
MpdResponse response = this.getConnection().Exec("rename", new string[] { oldName, newName }); MpdResponse response = _connection.Exec("rename", new string[] { oldName, newName });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -482,7 +472,7 @@ namespace Libmpc
/// <param name="newNr">The new index of the track in the playlist.</param> /// <param name="newNr">The new index of the track in the playlist.</param>
public void Move(int oldNr, int newNr) public void Move(int oldNr, int newNr)
{ {
MpdResponse response = this.getConnection().Exec("move", new string[] { oldNr.ToString(), newNr.ToString() }); MpdResponse response = _connection.Exec("move", new string[] { oldNr.ToString(), newNr.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -494,7 +484,7 @@ namespace Libmpc
/// <param name="nr">The new index of the track in the playlist.</param> /// <param name="nr">The new index of the track in the playlist.</param>
public void MoveId(int id, int nr) public void MoveId(int id, int nr)
{ {
MpdResponse response = this.getConnection().Exec("moveid", new string[] { id.ToString(), nr.ToString() }); MpdResponse response = _connection.Exec("moveid", new string[] { id.ToString(), nr.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -505,7 +495,7 @@ namespace Libmpc
/// <returns>The meta data of the items in the current playlist.</returns> /// <returns>The meta data of the items in the current playlist.</returns>
public List<MpdFile> PlaylistInfo() public List<MpdFile> PlaylistInfo()
{ {
MpdResponse response = this.getConnection().Exec("playlistinfo"); MpdResponse response = _connection.Exec("playlistinfo");
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -519,7 +509,7 @@ namespace Libmpc
/// <returns>The meta data of the track in the current playlist.</returns> /// <returns>The meta data of the track in the current playlist.</returns>
public MpdFile PlaylistInfo(int nr) public MpdFile PlaylistInfo(int nr)
{ {
MpdResponse response = this.getConnection().Exec("playlistinfo", new string[] { nr.ToString() } ); MpdResponse response = _connection.Exec("playlistinfo", new string[] { nr.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -532,7 +522,7 @@ namespace Libmpc
/// <returns>The meta data of the items in the current playlist.</returns> /// <returns>The meta data of the items in the current playlist.</returns>
public List<MpdFile> PlaylistId() public List<MpdFile> PlaylistId()
{ {
MpdResponse response = this.getConnection().Exec("playlistid"); MpdResponse response = _connection.Exec("playlistid");
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -546,7 +536,7 @@ namespace Libmpc
/// <returns>The meta data of the track in the current playlist.</returns> /// <returns>The meta data of the track in the current playlist.</returns>
public MpdFile PlaylistId(int id) public MpdFile PlaylistId(int id)
{ {
MpdResponse response = this.getConnection().Exec("playlistid", new string[] { id.ToString() }); MpdResponse response = _connection.Exec("playlistid", new string[] { id.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -560,7 +550,7 @@ namespace Libmpc
/// <returns>All changed songs in the playlist since the given version.</returns> /// <returns>All changed songs in the playlist since the given version.</returns>
public List<MpdFile> Plchanges(int version) public List<MpdFile> Plchanges(int version)
{ {
MpdResponse response = this.getConnection().Exec("plchanges", new string[] {version.ToString()}); MpdResponse response = _connection.Exec("plchanges", new string[] { version.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -577,7 +567,7 @@ namespace Libmpc
/// </returns> /// </returns>
public List<KeyValuePair<int, int>> PlChangesPosId(int version) public List<KeyValuePair<int, int>> PlChangesPosId(int version)
{ {
MpdResponse response = this.getConnection().Exec("plchangesposid", new string[] { version.ToString() }); MpdResponse response = _connection.Exec("plchangesposid", new string[] { version.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -624,7 +614,7 @@ namespace Libmpc
if (name == null) if (name == null)
throw new ArgumentNullException("name"); throw new ArgumentNullException("name");
MpdResponse response = this.getConnection().Exec("rm", new string[] { name }); MpdResponse response = _connection.Exec("rm", new string[] { name });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -638,7 +628,7 @@ namespace Libmpc
if (name == null) if (name == null)
throw new ArgumentNullException("name"); throw new ArgumentNullException("name");
MpdResponse response = this.getConnection().Exec("save", new string[] { name }); MpdResponse response = _connection.Exec("save", new string[] { name });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -648,7 +638,7 @@ namespace Libmpc
/// </summary> /// </summary>
public void Shuffle() public void Shuffle()
{ {
MpdResponse response = this.getConnection().Exec("shuffle"); MpdResponse response = _connection.Exec("shuffle");
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -660,7 +650,7 @@ namespace Libmpc
/// <param name="nr2">The index of the second track.</param> /// <param name="nr2">The index of the second track.</param>
public void Swap(int nr1, int nr2) public void Swap(int nr1, int nr2)
{ {
MpdResponse response = this.getConnection().Exec("swap", new string[] { nr1.ToString(), nr2.ToString() }); MpdResponse response = _connection.Exec("swap", new string[] { nr1.ToString(), nr2.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -672,7 +662,7 @@ namespace Libmpc
/// <param name="id2">The id of the second track.</param> /// <param name="id2">The id of the second track.</param>
public void SwapId(int id1, int id2) public void SwapId(int id1, int id2)
{ {
MpdResponse response = this.getConnection().Exec("swapid", new string[] { id1.ToString(), id2.ToString() }); MpdResponse response = _connection.Exec("swapid", new string[] { id1.ToString(), id2.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -687,7 +677,7 @@ namespace Libmpc
if (name == null) if (name == null)
throw new ArgumentNullException("name"); throw new ArgumentNullException("name");
MpdResponse response = this.getConnection().Exec("listplaylist", new string[] { name }); MpdResponse response = _connection.Exec("listplaylist", new string[] { name });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -704,7 +694,7 @@ namespace Libmpc
if (name == null) if (name == null)
throw new ArgumentNullException("name"); throw new ArgumentNullException("name");
MpdResponse response = this.getConnection().Exec("listplaylistinfo", new string[] { name }); MpdResponse response = _connection.Exec("listplaylistinfo", new string[] { name });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -723,7 +713,7 @@ namespace Libmpc
if (file == null) if (file == null)
throw new ArgumentNullException("file"); throw new ArgumentNullException("file");
MpdResponse response = this.getConnection().Exec("playlistadd", new string[] { name, file }); MpdResponse response = _connection.Exec("playlistadd", new string[] { name, file });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -737,7 +727,7 @@ namespace Libmpc
if (name == null) if (name == null)
throw new ArgumentNullException("name"); throw new ArgumentNullException("name");
MpdResponse response = this.getConnection().Exec("playlistclear", new string[] { name }); MpdResponse response = _connection.Exec("playlistclear", new string[] { name });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -752,7 +742,7 @@ namespace Libmpc
if (name == null) if (name == null)
throw new ArgumentNullException("name"); throw new ArgumentNullException("name");
MpdResponse response = this.getConnection().Exec("playlistdelete", new string[] { name, id.ToString() }); MpdResponse response = _connection.Exec("playlistdelete", new string[] { name, id.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -768,7 +758,7 @@ namespace Libmpc
if (name == null) if (name == null)
throw new ArgumentNullException("name"); throw new ArgumentNullException("name");
MpdResponse response = this.getConnection().Exec("playlistmove", new string[] { id.ToString(), nr.ToString() }); MpdResponse response = _connection.Exec("playlistmove", new string[] { id.ToString(), nr.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -784,7 +774,7 @@ namespace Libmpc
if (token == null) if (token == null)
throw new ArgumentNullException("token"); throw new ArgumentNullException("token");
MpdResponse response = this.getConnection().Exec("playlistfind", new string[] { this.toTag(scopeSpecifier), token }); MpdResponse response = _connection.Exec("playlistfind", new string[] { toTag(scopeSpecifier), token });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -802,7 +792,7 @@ namespace Libmpc
if (token == null) if (token == null)
throw new ArgumentNullException("token"); throw new ArgumentNullException("token");
MpdResponse response = this.getConnection().Exec("playlistsearch", new string[] { this.toTag(scopeSpecifier), token }); MpdResponse response = _connection.Exec("playlistsearch", new string[] { toTag(scopeSpecifier), token });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -818,7 +808,7 @@ namespace Libmpc
/// <param name="seconds">The seconds to crossfade between songs.</param> /// <param name="seconds">The seconds to crossfade between songs.</param>
public void Crossfade(int seconds) public void Crossfade(int seconds)
{ {
MpdResponse response = this.getConnection().Exec("crossfade", new string[] { seconds.ToString() }); MpdResponse response = _connection.Exec("crossfade", new string[] { seconds.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -828,7 +818,7 @@ namespace Libmpc
/// </summary> /// </summary>
public void Next() public void Next()
{ {
MpdResponse response = this.getConnection().Exec("next"); MpdResponse response = _connection.Exec("next");
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -839,7 +829,7 @@ namespace Libmpc
/// <param name="pause">If the playback should be paused or resumed.</param> /// <param name="pause">If the playback should be paused or resumed.</param>
public void Pause(bool pause) public void Pause(bool pause)
{ {
MpdResponse response = this.getConnection().Exec("pause", new string[] { pause ? "1" : "0" }); MpdResponse response = _connection.Exec("pause", new string[] { pause ? "1" : "0" });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -849,7 +839,7 @@ namespace Libmpc
/// </summary> /// </summary>
public void Play() public void Play()
{ {
MpdResponse response = this.getConnection().Exec("play"); MpdResponse response = _connection.Exec("play");
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -860,7 +850,7 @@ namespace Libmpc
/// <param name="nr">The index of the track in the playlist to start playing.</param> /// <param name="nr">The index of the track in the playlist to start playing.</param>
public void Play(int nr) public void Play(int nr)
{ {
MpdResponse response = this.getConnection().Exec("play", new string[] { nr.ToString() }); MpdResponse response = _connection.Exec("play", new string[] { nr.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -870,7 +860,7 @@ namespace Libmpc
/// </summary> /// </summary>
public void PlayId() public void PlayId()
{ {
MpdResponse response = this.getConnection().Exec("playid"); MpdResponse response = _connection.Exec("playid");
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -881,7 +871,7 @@ namespace Libmpc
/// <param name="id">The id of the track to start playing.</param> /// <param name="id">The id of the track to start playing.</param>
public void PlayId(int id) public void PlayId(int id)
{ {
MpdResponse response = this.getConnection().Exec("playid", new string[] { id.ToString() }); MpdResponse response = _connection.Exec("playid", new string[] { id.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -891,7 +881,7 @@ namespace Libmpc
/// </summary> /// </summary>
public void Previous() public void Previous()
{ {
MpdResponse response = this.getConnection().Exec("previous"); MpdResponse response = _connection.Exec("previous");
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -902,7 +892,7 @@ namespace Libmpc
/// <param name="random">If the MPD playlist should be played randomly.</param> /// <param name="random">If the MPD playlist should be played randomly.</param>
public void Random(bool random) public void Random(bool random)
{ {
MpdResponse response = this.getConnection().Exec("random", new string[] { random ? "1" : "0" }); MpdResponse response = _connection.Exec("random", new string[] { random ? "1" : "0" });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -913,7 +903,7 @@ namespace Libmpc
/// <param name="repeat">If the MPD should repeat the playlist.</param> /// <param name="repeat">If the MPD should repeat the playlist.</param>
public void Repeat(bool repeat) public void Repeat(bool repeat)
{ {
MpdResponse response = this.getConnection().Exec("repeat", new string[] { repeat ? "1" : "0" }); MpdResponse response = _connection.Exec("repeat", new string[] { repeat ? "1" : "0" });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -925,7 +915,7 @@ namespace Libmpc
/// <param name="time">The number of seconds to start playback on.</param> /// <param name="time">The number of seconds to start playback on.</param>
public void Seek(int nr, int time) public void Seek(int nr, int time)
{ {
MpdResponse response = this.getConnection().Exec("seek", new string[] { nr.ToString(), time.ToString() }); MpdResponse response = _connection.Exec("seek", new string[] { nr.ToString(), time.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -937,7 +927,7 @@ namespace Libmpc
/// <param name="time">The number of seconds to start playback on.</param> /// <param name="time">The number of seconds to start playback on.</param>
public void SeekId(int id, int time) public void SeekId(int id, int time)
{ {
MpdResponse response = this.getConnection().Exec("seekid", new string[] { id.ToString(), time.ToString() }); MpdResponse response = _connection.Exec("seekid", new string[] { id.ToString(), time.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -953,7 +943,7 @@ namespace Libmpc
if (vol > 100) if (vol > 100)
throw new ArgumentException("vol > 100"); throw new ArgumentException("vol > 100");
MpdResponse response = this.getConnection().Exec("setvol", new string[] { vol.ToString() }); MpdResponse response = _connection.Exec("setvol", new string[] { vol.ToString() });
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -963,7 +953,7 @@ namespace Libmpc
/// </summary> /// </summary>
public void Stop() public void Stop()
{ {
MpdResponse response = this.getConnection().Exec("stop"); MpdResponse response = _connection.Exec("stop");
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -977,7 +967,7 @@ namespace Libmpc
/// </summary> /// </summary>
public void ClearError() public void ClearError()
{ {
this.getConnection().Exec("clearerror"); _connection.Exec("clearerror");
} }
/// <summary> /// <summary>
/// Returns which commands the current user has access to. /// Returns which commands the current user has access to.
@ -985,7 +975,7 @@ namespace Libmpc
/// <returns>The commands the current user has access to.</returns> /// <returns>The commands the current user has access to.</returns>
public List<string> Commands() public List<string> Commands()
{ {
MpdResponse response = this.getConnection().Exec("commands"); MpdResponse response = _connection.Exec("commands");
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -998,7 +988,7 @@ namespace Libmpc
/// <returns>The commands the current user does has access to.</returns> /// <returns>The commands the current user does has access to.</returns>
public List<string> NotCommands() public List<string> NotCommands()
{ {
MpdResponse response = this.getConnection().Exec("notcommands"); MpdResponse response = _connection.Exec("notcommands");
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -1015,14 +1005,14 @@ namespace Libmpc
if (password == null) if (password == null)
throw new ArgumentNullException("password"); throw new ArgumentNullException("password");
return this.getConnection().Exec("password", new string[] { password }).IsError; return _connection.Exec("password", new string[] { password }).IsError;
} }
/// <summary> /// <summary>
/// Sends a ping command to the server and waits for the response. /// Sends a ping command to the server and waits for the response.
/// </summary> /// </summary>
public void Ping() public void Ping()
{ {
this.getConnection().Exec("ping"); _connection.Exec("ping");
} }
/// <summary> /// <summary>
/// Requests the current statistics from the MPD, /// Requests the current statistics from the MPD,
@ -1030,7 +1020,7 @@ namespace Libmpc
/// <returns>The current statistics fromt the MPD.</returns> /// <returns>The current statistics fromt the MPD.</returns>
public MpdStatistics Stats() public MpdStatistics Stats()
{ {
MpdResponse response = this.getConnection().Exec("stats"); MpdResponse response = _connection.Exec("stats");
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);
@ -1108,7 +1098,7 @@ namespace Libmpc
/// <returns>The current status of the MPD.</returns> /// <returns>The current status of the MPD.</returns>
public MpdStatus Status() public MpdStatus Status()
{ {
MpdResponse response = this.getConnection().Exec("status"); MpdResponse response = _connection.Exec("status");
if (response.IsError) if (response.IsError)
throw new MpdResponseException(response.ErrorCode, response.ErrorMessage); throw new MpdResponseException(response.ErrorCode, response.ErrorMessage);

30
LibMpc/MpcConnection.cs
View File

@ -19,11 +19,11 @@ namespace Libmpc
/// <summary> /// <summary>
/// Is fired when a connection to a MPD server is established. /// Is fired when a connection to a MPD server is established.
/// </summary> /// </summary>
public event EventHandler OnConnected; public event EventHandler Connected;
/// <summary> /// <summary>
/// Is fired when the connection to the MPD server is closed. /// Is fired when the connection to the MPD server is closed.
/// </summary> /// </summary>
public event EventHandler OnDisconnected; public event EventHandler Disconnected;
private static readonly string FIRST_LINE_PREFIX = "OK MPD "; private static readonly string FIRST_LINE_PREFIX = "OK MPD ";
@ -44,7 +44,7 @@ namespace Libmpc
/// <summary> /// <summary>
/// If the connection to the MPD is connected. /// If the connection to the MPD is connected.
/// </summary> /// </summary>
public bool Connected { get { return (_tcpClient != null) && _tcpClient.Connected; } } public bool IsConnected { get { return (_tcpClient != null) && _tcpClient.Connected; } }
/// <summary> /// <summary>
/// The version of the MPD. /// The version of the MPD.
/// </summary> /// </summary>
@ -67,7 +67,7 @@ namespace Libmpc
/// <param name="server">The IPEndPoint of the MPD server.</param> /// <param name="server">The IPEndPoint of the MPD server.</param>
public MpcConnection(IPEndPoint server) public MpcConnection(IPEndPoint server)
{ {
Connect(server); Server = server;
} }
/// <summary> /// <summary>
/// The IPEndPoint of the MPD server. /// The IPEndPoint of the MPD server.
@ -78,7 +78,7 @@ namespace Libmpc
get { return _ipEndPoint; } get { return _ipEndPoint; }
set set
{ {
if (Connected) if (IsConnected)
throw new AlreadyConnectedException(); throw new AlreadyConnectedException();
_ipEndPoint = value; _ipEndPoint = value;
@ -86,15 +86,7 @@ namespace Libmpc
ClearConnectionFields(); ClearConnectionFields();
} }
} }
/// <summary>
/// Connects to a MPD server.
/// </summary>
/// <param name="server">The IPEndPoint of the server.</param>
public void Connect(IPEndPoint server)
{
Server = server;
Connect();
}
/// <summary> /// <summary>
/// Connects to the MPD server who's IPEndPoint was set in the Server property. /// Connects to the MPD server who's IPEndPoint was set in the Server property.
/// </summary> /// </summary>
@ -104,7 +96,7 @@ namespace Libmpc
if (_ipEndPoint == null) if (_ipEndPoint == null)
throw new InvalidOperationException("Server IPEndPoint not set."); throw new InvalidOperationException("Server IPEndPoint not set.");
if (Connected) if (IsConnected)
throw new AlreadyConnectedException(); throw new AlreadyConnectedException();
@ -131,7 +123,7 @@ namespace Libmpc
ReadResponse(); ReadResponse();
OnConnected?.Invoke(this, EventArgs.Empty); Connected?.Invoke(this, EventArgs.Empty);
} }
/// <summary> /// <summary>
/// Disconnects from the current MPD server. /// Disconnects from the current MPD server.
@ -145,7 +137,7 @@ namespace Libmpc
ClearConnectionFields(); ClearConnectionFields();
OnDisconnected?.Invoke(this, EventArgs.Empty); Disconnected?.Invoke(this, EventArgs.Empty);
} }
/// <summary> /// <summary>
/// Executes a simple command without arguments on the MPD server and returns the response. /// Executes a simple command without arguments on the MPD server and returns the response.
@ -175,7 +167,7 @@ namespace Libmpc
{ {
try { Disconnect(); } try { Disconnect(); }
catch (Exception) { } catch (Exception) { }
throw; return null; // TODO: Create Null Object for MpdResponse
} }
} }
/// <summary> /// <summary>
@ -228,7 +220,7 @@ namespace Libmpc
private void CheckConnected() private void CheckConnected()
{ {
if (!Connected) if (!IsConnected)
{ {
if (_autoConnect) if (_autoConnect)
Connect(); Connect();