Add current songInfo to the Webserver and Site
This commit is contained in:
1 parent
8dfa321c8a
commit
197f003211
10 files changed
+196
-3
No files matched your search
@@ -67,6 +67,17 @@ namespace ClientServerLib
|
||||
|
||||
#endregion
|
||||
|
||||
#region songs
|
||||
|
||||
private static GetCurrentSongDelegate getCurrentSong;
|
||||
public static GetCurrentSongDelegate GetCurrentSong
|
||||
{
|
||||
internal get { return CServer.getCurrentSong; }
|
||||
set { CServer.getCurrentSong = value; }
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
public CServer(int port)
|
||||
{
|
||||
baseAddress = new Uri("http://localhost:" + port + "/");
|
||||
|
||||
@@ -84,6 +84,16 @@ namespace ClientServerLib
|
||||
Stream GetImgFile(String filename);
|
||||
|
||||
#endregion
|
||||
|
||||
#region songs
|
||||
|
||||
[OperationContract]
|
||||
[WebInvoke(Method = "GET",
|
||||
ResponseFormat = WebMessageFormat.Json,
|
||||
UriTemplate = "/getCurrentSong")]
|
||||
SongInfo getCurrentSong();
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
class CWebservice : ICWebservice
|
||||
@@ -135,7 +145,7 @@ namespace ClientServerLib
|
||||
#region photo
|
||||
|
||||
public bool sendPhoto(PhotoData photo)
|
||||
{
|
||||
{
|
||||
return CServer.SendPhoto(photo);
|
||||
}
|
||||
|
||||
@@ -236,5 +246,14 @@ namespace ClientServerLib
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region songs
|
||||
|
||||
public SongInfo getCurrentSong()
|
||||
{
|
||||
return CServer.GetCurrentSong();
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -90,4 +90,29 @@ namespace ClientServerLib
|
||||
|
||||
|
||||
}
|
||||
|
||||
#region songs
|
||||
|
||||
public delegate SongInfo GetCurrentSongDelegate();
|
||||
|
||||
[DataContract]
|
||||
public struct SongInfo
|
||||
{
|
||||
[DataMember]
|
||||
public string Title;
|
||||
[DataMember]
|
||||
public string Artist;
|
||||
[DataMember]
|
||||
public Base64Image Cover;
|
||||
[DataMember]
|
||||
public string Genre { get; set; }
|
||||
[DataMember]
|
||||
public string Language { get; set; }
|
||||
[DataMember]
|
||||
public string Year { get; set; }
|
||||
[DataMember]
|
||||
public bool IsDuet { get; set; }
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
Reference in new issue
Block a user