Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop
This commit is contained in:
commit
67cbba5604
7 files changed
+9
-115282
No files matched your search
@@ -205,13 +205,15 @@ namespace ServerLib
|
||||
|
||||
public static string GetLocalAddress()
|
||||
{
|
||||
IPAddress[] ips = Dns.GetHostAddresses(Dns.GetHostName());
|
||||
return Dns.GetHostName();
|
||||
|
||||
/*IPAddress[] ips = Dns.GetHostAddresses(Dns.GetHostName());
|
||||
foreach (IPAddress ip in ips)
|
||||
{
|
||||
if (ip.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
|
||||
return ip.ToString();
|
||||
}
|
||||
return "";
|
||||
return "";*/
|
||||
}
|
||||
|
||||
#region server control
|
||||
|
||||
Binary file not shown.
-57639
File diff suppressed because it is too large.
Load diff
Binary file not shown.
-57639
File diff suppressed because it is too large.
Load diff
@@ -678,9 +678,9 @@ namespace Vocaluxe.Base.Server
|
||||
}
|
||||
|
||||
//Hide TR_USERROLE_GUEST and TR_USERROLE_NORMAL
|
||||
const EUserRole mask = (EUserRole.TR_USERROLE_GUEST | EUserRole.TR_USERROLE_NORMAL);
|
||||
//const EUserRole mask = (EUserRole.TR_USERROLE_GUEST | EUserRole.TR_USERROLE_NORMAL);
|
||||
|
||||
return (int)(profile.UserRole & ~mask);
|
||||
return (int)(profile.UserRole);
|
||||
}
|
||||
|
||||
private static void _SetUserRole(int profileId, int userRole)
|
||||
|
||||
@@ -197,6 +197,8 @@ namespace VocaluxeLib.Menu.SongMenu
|
||||
}
|
||||
|
||||
private void UpdateLength(CSong song)
|
||||
{
|
||||
if (song != null)
|
||||
{
|
||||
float time = CBase.Sound.GetLength(_PreviewSongStream);
|
||||
if (Math.Abs(song.Finish) > 0.001)
|
||||
@@ -212,6 +214,7 @@ namespace VocaluxeLib.Menu.SongMenu
|
||||
_Length = time;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnShow()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user