Merge pull request #103 from flokuep/develop

sound/song-player
This commit is contained in:
Stephan Sundermann committed 2014-09-13 19:34:54 +02:00
commit 1a94f3a6f8
100 files changed
+2110 -1933

No files matched your search

-226
View File
@@ -5,230 +5,4 @@
<Folder>Blue</Folder> <Folder>Blue</Folder>
<Author>flokuep</Author> <Author>flokuep</Author>
</Info> </Info>
<Cover>
<Cover1>
<Name>NoCover</Name>
<Path>NoCover.png</Path>
</Cover1>
<Cover2>
<Name>A</Name>
<Path>A.png</Path>
</Cover2>
<Cover3>
<Name>B</Name>
<Path>B.png</Path>
</Cover3>
<Cover4>
<Name>C</Name>
<Path>C.png</Path>
</Cover4>
<Cover5>
<Name>D</Name>
<Path>D.png</Path>
</Cover5>
<Cover6>
<Name>E</Name>
<Path>E.png</Path>
</Cover6>
<Cover7>
<Name>F</Name>
<Path>F.png</Path>
</Cover7>
<Cover8>
<Name>G</Name>
<Path>G.png</Path>
</Cover8>
<Cover9>
<Name>H</Name>
<Path>H.png</Path>
</Cover9>
<Cover10>
<Name>I</Name>
<Path>I.png</Path>
</Cover10>
<Cover11>
<Name>J</Name>
<Path>J.png</Path>
</Cover11>
<Cover12>
<Name>K</Name>
<Path>K.png</Path>
</Cover12>
<Cover13>
<Name>L</Name>
<Path>L.png</Path>
</Cover13>
<Cover14>
<Name>M</Name>
<Path>M.png</Path>
</Cover14>
<Cover15>
<Name>N</Name>
<Path>N.png</Path>
</Cover15>
<Cover16>
<Name>O</Name>
<Path>O.png</Path>
</Cover16>
<Cover17>
<Name>P</Name>
<Path>P.png</Path>
</Cover17>
<Cover18>
<Name>Q</Name>
<Path>Q.png</Path>
</Cover18>
<Cover19>
<Name>R</Name>
<Path>R.png</Path>
</Cover19>
<Cover20>
<Name>S</Name>
<Path>S.png</Path>
</Cover20>
<Cover21>
<Name>T</Name>
<Path>T.png</Path>
</Cover21>
<Cover22>
<Name>U</Name>
<Path>U.png</Path>
</Cover22>
<Cover23>
<Name>V</Name>
<Path>V.png</Path>
</Cover23>
<Cover24>
<Name>W</Name>
<Path>W.png</Path>
</Cover24>
<Cover25>
<Name>X</Name>
<Path>X.png</Path>
</Cover25>
<Cover26>
<Name>Y</Name>
<Path>Y.png</Path>
</Cover26>
<Cover27>
<Name>Z</Name>
<Path>Z.png</Path>
</Cover27>
<Cover28>
<Name>#</Name>
<Path>#.png</Path>
</Cover28>
<Cover29>
<Name>No Year</Name>
<Path>NoYear.png</Path>
</Cover29>
<Cover30>
<Name>Ohne Jahr</Name>
<Path>OhneJahr.png</Path>
</Cover30>
<Cover31>
<Name>1900 - 1909</Name>
<Path>1900er.png</Path>
</Cover31>
<Cover32>
<Name>1910 - 1919</Name>
<Path>1910er.png</Path>
</Cover32>
<Cover33>
<Name>1920 - 1929</Name>
<Path>20er.png</Path>
</Cover33>
<Cover34>
<Name>1930 - 1939</Name>
<Path>30er.png</Path>
</Cover34>
<Cover35>
<Name>1940 - 1949</Name>
<Path>40er.png</Path>
</Cover35>
<Cover36>
<Name>1950 - 1959</Name>
<Path>50er.png</Path>
</Cover36>
<Cover37>
<Name>1960 - 1969</Name>
<Path>60er.png</Path>
</Cover37>
<Cover38>
<Name>1970 - 1979</Name>
<Path>70er.png</Path>
</Cover38>
<Cover39>
<Name>1980 - 1989</Name>
<Path>80er.png</Path>
</Cover39>
<Cover40>
<Name>1990 - 1999</Name>
<Path>90er.png</Path>
</Cover40>
<Cover41>
<Name>2000 - 2009</Name>
<Path>2000er.png</Path>
</Cover41>
<Cover42>
<Name>2010 - 2019</Name>
<Path>2010er.png</Path>
</Cover42>
<Cover43>
<Name>No Language</Name>
<Path>NoLanguage.png</Path>
</Cover43>
<Cover44>
<Name>Ohne Sprache</Name>
<Path>OhneSprache.png</Path>
</Cover44>
<Cover45>
<Name>German</Name>
<Path>German.png</Path>
</Cover45>
<Cover46>
<Name>English</Name>
<Path>English.png</Path>
</Cover46>
<Cover47>
<Name>French</Name>
<Path>French.png</Path>
</Cover47>
<Cover48>
<Name>Italian</Name>
<Path>Italian.png</Path>
</Cover48>
<Cover49>
<Name>Spanish</Name>
<Path>Spanish.png</Path>
</Cover49>
<Cover50>
<Name>Polish</Name>
<Path>Polish.png</Path>
</Cover50>
<Cover51>
<Name>No Edition</Name>
<Path>NoEdition.png</Path>
</Cover51>
<Cover52>
<Name>Ohne Edition</Name>
<Path>OhneEdition.png</Path>
</Cover52>
<Cover53>
<Name>No Genre</Name>
<Path>NoGenre.png</Path>
</Cover53>
<Cover54>
<Name>Ohne Genre</Name>
<Path>OhneGenre.png</Path>
</Cover54>
<Cover55>
<Name>All Songs</Name>
<Path>AllSongs.png</Path>
</Cover55>
<Cover56>
<Name>Alle Songs</Name>
<Path>AlleSongs.png</Path>
</Cover56>
</Cover>
</root> </root>
File renamed without changes.

Before

Width:  |  Height:  |  Size: 257 KiB

After

Width:  |  Height:  |  Size: 257 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 260 KiB

After

Width:  |  Height:  |  Size: 260 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 258 KiB

After

Width:  |  Height:  |  Size: 258 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 260 KiB

After

Width:  |  Height:  |  Size: 260 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 256 KiB

After

Width:  |  Height:  |  Size: 256 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 257 KiB

After

Width:  |  Height:  |  Size: 257 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 259 KiB

After

Width:  |  Height:  |  Size: 259 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 259 KiB

After

Width:  |  Height:  |  Size: 259 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 258 KiB

After

Width:  |  Height:  |  Size: 258 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 259 KiB

After

Width:  |  Height:  |  Size: 259 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 254 KiB

After

Width:  |  Height:  |  Size: 254 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 257 KiB

After

Width:  |  Height:  |  Size: 257 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 275 KiB

After

Width:  |  Height:  |  Size: 275 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 274 KiB

After

Width:  |  Height:  |  Size: 274 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 275 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 268 KiB

After

Width:  |  Height:  |  Size: 268 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 264 KiB

After

Width:  |  Height:  |  Size: 264 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 267 KiB

After

Width:  |  Height:  |  Size: 267 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 275 KiB

After

Width:  |  Height:  |  Size: 275 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 270 KiB

After

Width:  |  Height:  |  Size: 270 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 273 KiB

After

Width:  |  Height:  |  Size: 273 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 275 KiB

After

Width:  |  Height:  |  Size: 275 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 274 KiB

After

Width:  |  Height:  |  Size: 274 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 273 KiB

After

Width:  |  Height:  |  Size: 273 KiB

+1
View File
@@ -76,6 +76,7 @@
<string name="TR_CONFIG_OWN_MUSIC">Own Music and Background Music</string> <string name="TR_CONFIG_OWN_MUSIC">Own Music and Background Music</string>
<string name="TR_CONFIG_NO_OWN_MUSIC">No own Music</string> <string name="TR_CONFIG_NO_OWN_MUSIC">No own Music</string>
<string name="TR_CONFIG_ONLY_OWN_MUSIC">Only own Music</string> <string name="TR_CONFIG_ONLY_OWN_MUSIC">Only own Music</string>
<string name="TR_CONFIG_ONLY_SONG">Only selected song</string>
<string name="TR_CONFIG_FADEPLAYERINFO_ALL">All</string> <string name="TR_CONFIG_FADEPLAYERINFO_ALL">All</string>
<string name="TR_CONFIG_FADEPLAYERINFO_INFO">Only names and avatars</string> <string name="TR_CONFIG_FADEPLAYERINFO_INFO">Only names and avatars</string>
<string name="TR_CONFIG_FADEPLAYERINFO_OFF">Nothing</string> <string name="TR_CONFIG_FADEPLAYERINFO_OFF">Nothing</string>
@@ -270,7 +270,7 @@ namespace VocaluxeLib.PartyModes.Challenge
public override void UpdateGame() public override void UpdateGame()
{ {
/* /*
if (CBase.Songs.GetCurrentCategoryIndex() != -1 || _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_OFF) if (CBase.Songs.IsInCategory() || _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_OFF)
_ScreenSongOptions.Selection.RandomOnly = true; _ScreenSongOptions.Selection.RandomOnly = true;
else else
_ScreenSongOptions.Selection.RandomOnly = false;*/ _ScreenSongOptions.Selection.RandomOnly = false;*/
@@ -475,12 +475,12 @@ namespace VocaluxeLib.PartyModes.Challenge
players[i].ProfileID = -1; players[i].ProfileID = -1;
} }
CBase.Songs.AddPartySongSung(songID);
CBase.Graphics.FadeTo(EScreens.ScreenSing); CBase.Graphics.FadeTo(EScreens.ScreenSing);
} }
public override void LeavingHighscore() public override void LeavingHighscore()
{ {
CBase.Songs.AddPartySongSung(CBase.Game.GetSong(0).ID);
_GameData.CurrentRoundNr++; _GameData.CurrentRoundNr++;
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy); CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
} }
@@ -275,7 +275,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
public override void UpdateGame() public override void UpdateGame()
{ {
/* /*
if (CBase.Songs.GetCurrentCategoryIndex() != -1 || _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_OFF) if (CBase.Songs.IsInCategory() || _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_OFF)
_ScreenSongOptions.Selection.RandomOnly = true; _ScreenSongOptions.Selection.RandomOnly = true;
else else
_ScreenSongOptions.Selection.RandomOnly = false;*/ _ScreenSongOptions.Selection.RandomOnly = false;*/
@@ -457,6 +457,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
public override void LeavingHighscore() public override void LeavingHighscore()
{ {
for (int i = 0; i < CBase.Game.GetNumSongs();i++ )
CBase.Songs.AddPartySongSung(CBase.Game.GetSong(i).ID);
_GameData.CurrentRoundNr++; _GameData.CurrentRoundNr++;
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy); CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
} }
@@ -542,7 +544,6 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
{ {
int songID = ids[CBase.Game.GetRandom(ids.Count)]; int songID = ids[CBase.Game.GetRandom(ids.Count)];
CBase.Game.AddSong(songID, EGameMode.TR_GAMEMODE_MEDLEY); CBase.Game.AddSong(songID, EGameMode.TR_GAMEMODE_MEDLEY);
CBase.Songs.AddPartySongSung(songID);
ids.Remove(songID); ids.Remove(songID);
s++; s++;
} }
@@ -329,7 +329,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
public override void UpdateGame() public override void UpdateGame()
{ {
/* /*
if (CBase.Songs.GetCurrentCategoryIndex() != -1 || _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_OFF) if (CBase.Songs.IsInCategory() || _ScreenSongOptions.Sorting.Tabs == EOffOn.TR_CONFIG_OFF)
_ScreenSongOptions.Selection.RandomOnly = true; _ScreenSongOptions.Selection.RandomOnly = true;
else else
_ScreenSongOptions.Selection.RandomOnly = false;*/ _ScreenSongOptions.Selection.RandomOnly = false;*/
@@ -515,12 +515,12 @@ namespace VocaluxeLib.PartyModes.TicTacToe
} }
CBase.Game.AddSong(songID, gm); CBase.Game.AddSong(songID, gm);
CBase.Songs.AddPartySongSung(songID);
CBase.Graphics.FadeTo(EScreens.ScreenSing); CBase.Graphics.FadeTo(EScreens.ScreenSing);
} }
public override void LeavingHighscore() public override void LeavingHighscore()
{ {
CBase.Songs.AddPartySongSung(CBase.Game.GetSong(0).ID);
_UpdateScores(); _UpdateScores();
CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy); CBase.Graphics.FadeTo(EScreens.ScreenPartyDummy);
} }
@@ -655,9 +655,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe
switch (_GameData.SongSource) switch (_GameData.SongSource)
{ {
case ESongSource.TR_PLAYLIST: case ESongSource.TR_PLAYLIST:
for (int i = 0; i < CBase.Playlist.GetPlaylistSongCount(_GameData.PlaylistID); i++) for (int i = 0; i < CBase.Playlist.GetSongCount(_GameData.PlaylistID); i++)
{ {
int id = CBase.Playlist.GetPlaylistSong(_GameData.PlaylistID, i).SongID; int id = CBase.Playlist.GetSong(_GameData.PlaylistID, i).SongID;
// ReSharper disable LoopCanBeConvertedToQuery // ReSharper disable LoopCanBeConvertedToQuery
foreach (EGameMode mode in CBase.Songs.GetSongByID(id).AvailableGameModes) foreach (EGameMode mode in CBase.Songs.GetSongByID(id).AvailableGameModes)
// ReSharper restore LoopCanBeConvertedToQuery // ReSharper restore LoopCanBeConvertedToQuery
@@ -180,11 +180,11 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_SelectSlides[_SelectSlideSongSource].Clear(); _SelectSlides[_SelectSlideSongSource].Clear();
_SelectSlides[_SelectSlideSongSource].SetValues<ESongSource>((int)_Data.ScreenConfig.SongSource); _SelectSlides[_SelectSlideSongSource].SetValues<ESongSource>((int)_Data.ScreenConfig.SongSource);
List<string> playlists = CBase.Playlist.GetPlaylistNames(); List<string> playlists = CBase.Playlist.GetNames();
_SelectSlides[_SelectSlidePlaylist].Clear(); _SelectSlides[_SelectSlidePlaylist].Clear();
for (int i = 0; i < playlists.Count; i++) for (int i = 0; i < playlists.Count; i++)
{ {
string value = playlists[i] + " (" + CBase.Playlist.GetPlaylistSongCount(i) + " " + CBase.Language.Translate("TR_SONGS", _PartyModeID) + ")"; string value = playlists[i] + " (" + CBase.Playlist.GetSongCount(i) + " " + CBase.Language.Translate("TR_SONGS", _PartyModeID) + ")";
_SelectSlides[_SelectSlidePlaylist].AddValue(value); _SelectSlides[_SelectSlidePlaylist].AddValue(value);
} }
_SelectSlides[_SelectSlidePlaylist].Selection = _Data.ScreenConfig.PlaylistID; _SelectSlides[_SelectSlidePlaylist].Selection = _Data.ScreenConfig.PlaylistID;
@@ -241,12 +241,12 @@ namespace VocaluxeLib.PartyModes.TicTacToe
{ {
if (CBase.Playlist.GetNumPlaylists() > 0) if (CBase.Playlist.GetNumPlaylists() > 0)
{ {
if (CBase.Playlist.GetPlaylistSongCount(_Data.ScreenConfig.PlaylistID) > 0) if (CBase.Playlist.GetSongCount(_Data.ScreenConfig.PlaylistID) > 0)
{ {
_ConfigOk = false; _ConfigOk = false;
for (int i = 0; i < CBase.Playlist.GetPlaylistSongCount(_Data.ScreenConfig.PlaylistID); i++) for (int i = 0; i < CBase.Playlist.GetSongCount(_Data.ScreenConfig.PlaylistID); i++)
{ {
int id = CBase.Playlist.GetPlaylistSong(_Data.ScreenConfig.PlaylistID, i).SongID; int id = CBase.Playlist.GetSong(_Data.ScreenConfig.PlaylistID, i).SongID;
_ConfigOk = CBase.Songs.GetSongByID(id).AvailableGameModes.Any(mode => mode == gm); _ConfigOk = CBase.Songs.GetSongByID(id).AvailableGameModes.Any(mode => mode == gm);
if (_ConfigOk) if (_ConfigOk)
break; break;
@@ -378,8 +378,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
public override void OnClose() public override void OnClose()
{ {
base.OnClose(); base.OnClose();
CBase.BackgroundMusic.SetStatus(false); CBase.BackgroundMusic.SetDisabled(false);
CBase.Sound.FadeAndClose(_PreviewStream, 0f, 0.5f); CBase.Sound.Fade(_PreviewStream, 0f, 0.5f, EStreamAction.Close);
} }
private void _CreateFields() private void _CreateFields()
@@ -501,7 +501,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
} }
CSong song = CBase.Songs.GetSongByID(songID); CSong song = CBase.Songs.GetSongByID(songID);
CBase.BackgroundMusic.SetStatus(true); CBase.BackgroundMusic.SetDisabled(true);
_PreviewStream = CBase.Sound.Load(song.GetMP3()); _PreviewStream = CBase.Sound.Load(song.GetMP3());
CBase.Sound.SetPosition(_PreviewStream, song.Preview.StartTime); CBase.Sound.SetPosition(_PreviewStream, song.Preview.StartTime);
@@ -525,7 +525,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
{ {
int songID = _Fields[_SelectedField].Content.SongID; int songID = _Fields[_SelectedField].Content.SongID;
CSong song = CBase.Songs.GetSongByID(songID); CSong song = CBase.Songs.GetSongByID(songID);
CBase.BackgroundMusic.SetStatus(true); CBase.BackgroundMusic.SetDisabled(true);
_PreviewStream = CBase.Sound.Load(song.GetMP3()); _PreviewStream = CBase.Sound.Load(song.GetMP3());
CBase.Sound.SetPosition(_PreviewStream, song.Preview.StartTime); CBase.Sound.SetPosition(_PreviewStream, song.Preview.StartTime);
@@ -574,7 +574,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
{ {
_GameData.NumJokerRandom[teamNr]--; _GameData.NumJokerRandom[teamNr]--;
if (!CBase.Sound.IsFinished(_PreviewStream)) if (!CBase.Sound.IsFinished(_PreviewStream))
CBase.Sound.FadeAndClose(_PreviewStream, 0, 1); CBase.Sound.Fade(_PreviewStream, 0, 1, EStreamAction.Close);
_FieldSelected(true); _FieldSelected(true);
} }
break; break;
@@ -586,7 +586,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_GameData.NumJokerRetry[teamNr]--; _GameData.NumJokerRetry[teamNr]--;
_GameData.Team = teamNr; _GameData.Team = teamNr;
if (!CBase.Sound.IsFinished(_PreviewStream)) if (!CBase.Sound.IsFinished(_PreviewStream))
CBase.Sound.FadeAndClose(_PreviewStream, 0, 1); CBase.Sound.Fade(_PreviewStream, 0, 1, EStreamAction.Close);
_Status = EStatus.JokerRetry; _Status = EStatus.JokerRetry;
_OldSelectedField = _SelectedField; _OldSelectedField = _SelectedField;
_SelectedField = -1; _SelectedField = -1;
@@ -627,7 +627,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
private void _NextRound() private void _NextRound()
{ {
CBase.Sound.FadeAndClose(_PreviewStream, 0f, 0.5f); CBase.Sound.Fade(_PreviewStream, 0f, 0.5f, EStreamAction.Close);
_Data.ScreenMain.Rounds = _GameData.Rounds; _Data.ScreenMain.Rounds = _GameData.Rounds;
_Data.ScreenMain.FadeToNameSelection = false; _Data.ScreenMain.FadeToNameSelection = false;
_Data.ScreenMain.FadeToSinging = true; _Data.ScreenMain.FadeToSinging = true;
@@ -640,7 +640,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
private void _EndParty() private void _EndParty()
{ {
CBase.Sound.FadeAndClose(_PreviewStream, 0f, 0.5f); CBase.Sound.Fade(_PreviewStream, 0f, 0.5f, EStreamAction.Close);
_FadeTo(EScreens.ScreenParty); _FadeTo(EScreens.ScreenParty);
} }
@@ -659,7 +659,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
private void _Back() private void _Back()
{ {
CBase.Sound.FadeAndClose(_PreviewStream, 0f, 0.5f); CBase.Sound.Fade(_PreviewStream, 0f, 0.5f, EStreamAction.Close);
_Data.ScreenMain.FadeToNameSelection = true; _Data.ScreenMain.FadeToNameSelection = true;
_Data.ScreenMain.FadeToSinging = false; _Data.ScreenMain.FadeToSinging = false;
_Data.ScreenMain.SingRoundNr = _SelectedField; _Data.ScreenMain.SingRoundNr = _SelectedField;
+11 -4
View File
@@ -16,7 +16,9 @@
#endregion #endregion
using System; using System;
#if WIN
using System.Diagnostics; using System.Diagnostics;
#endif
using System.ServiceModel; using System.ServiceModel;
using System.ServiceModel.Web; using System.ServiceModel.Web;
using System.Net; using System.Net;
@@ -160,7 +162,7 @@ namespace ServerLib
catch (CommunicationException) catch (CommunicationException)
{ {
_Host.Abort(); _Host.Abort();
MessageBox.Show("Problem while initialization of webserver. You may use a different port (Change in config.xml)"); MessageBox.Show("Problem while initialization of webserver. You may try a different port (Change it in config.xml)");
} }
} }
else else
@@ -187,8 +189,8 @@ namespace ServerLib
ProcessStartInfo info = new ProcessStartInfo ProcessStartInfo info = new ProcessStartInfo
{ {
FileName = "VocaluxeServerConfig.exe", FileName = "VocaluxeServerConfig.exe",
WorkingDirectory = Environment.CurrentDirectory, WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory,
Arguments = port + " " + (_Encrypted ? "true" : "false") + (reserve ? " reserve" : ""), Arguments = AppDomain.CurrentDomain.FriendlyName + " " + port + " " + (_Encrypted ? "true" : "false") + (reserve ? " true" : ""),
UseShellExecute = true, UseShellExecute = true,
CreateNoWindow = true, CreateNoWindow = true,
WindowStyle = ProcessWindowStyle.Hidden, WindowStyle = ProcessWindowStyle.Hidden,
@@ -198,10 +200,15 @@ namespace ServerLib
using (Process p = Process.Start(info)) using (Process p = Process.Start(info))
{ {
p.WaitForExit(); p.WaitForExit();
if (p.ExitCode != 0)
MessageBox.Show("Registering the Server failed (Code " + p.ExitCode + ")!\r\nThe Server might not work correctly.");
p.Close(); p.Close();
} }
} }
catch (Exception) {} catch (Exception e)
{
MessageBox.Show("Registering the Server failed (" + e + ")!\r\nThe Server might not work correctly.");
}
#else #else
//Required? //Required?
+156 -146
View File
@@ -22,6 +22,7 @@ using System.IO;
using VocaluxeLib; using VocaluxeLib;
using VocaluxeLib.Songs; using VocaluxeLib.Songs;
using VocaluxeLib.Draw; using VocaluxeLib.Draw;
using VocaluxeLib.Utils.Player;
namespace Vocaluxe.Base namespace Vocaluxe.Base
{ {
@@ -29,89 +30,98 @@ namespace Vocaluxe.Base
{ {
private static bool _Initialized; private static bool _Initialized;
private static CSongPlayer _SongPlayer;
private static CSongPlayer _PreviewPlayer;
private static bool _OwnSongsAvailable; private static bool _OwnSongsAvailable;
private static EBackgroundMusicSource _MusicSource; private static EBackgroundMusicSource _MusicSource;
private static bool _VideoEnabled; private static bool _VideoEnabled;
private static CPlaylistElement _CurrentPlaylistElement; //Currently played music private static CPlaylistElement _CurrentPlaylistElement; //Currently played music
private static int _CurrentMusicStream = -1; //Current active music stream private static int _PreviousMusicIndex = -1;
private static int _PreviousMusicIndex; //Index of _CurrentPlaylistElement in _PreviousFiles (kept for performance)
private static readonly List<CPlaylistElement> _BGMusicFiles = new List<CPlaylistElement>(); //Background music files private static readonly List<CPlaylistElement> _BGMusicFiles = new List<CPlaylistElement>(); //Background music files
private static readonly List<CPlaylistElement> _NotPlayedFiles = new List<CPlaylistElement>(); //Not played files private static readonly List<CPlaylistElement> _NotPlayedFiles = new List<CPlaylistElement>(); //Not played files
private static readonly List<CPlaylistElement> _PreviousFiles = new List<CPlaylistElement>(); //Played files private static readonly List<CPlaylistElement> _PreviousFiles = new List<CPlaylistElement>(); //Played files
private static int _Video = -1;
private static CTexture _CurrentVideoTexture;
private static CFading _VideoFading;
private static bool _OwnMusicAdded; private static bool _OwnMusicAdded;
private static bool _BackgroundMusicAdded; private static bool _BackgroundMusicAdded;
private static bool _Disabled; private static bool _Disabled;
private static bool _PlaysPreview;
public static bool VideoEnabled public static bool VideoEnabled
{ {
get { return _VideoEnabled; } get { return _PlaysPreview ? _PreviewPlayer.VideoEnabled : _SongPlayer.VideoEnabled; }
set set {
{ if(_PlaysPreview)
if (_VideoEnabled == value) _PreviewPlayer.VideoEnabled = value;
return; else
_VideoEnabled = value; _SongPlayer.VideoEnabled = value;
if (_VideoEnabled)
_LoadVideo();
else if (_Video != -1)
{
CVideo.Close(_Video);
CDraw.RemoveTexture(ref _CurrentVideoTexture);
_Video = -1;
}
} }
} }
public static bool CanSing { get; private set; } public static bool CanSing
{
get
{
if (_PlaysPreview)
return false;
else
if (_BGMusicFiles.Contains(_CurrentPlaylistElement))
return false;
else return true;
}
}
public static bool Disabled public static bool Disabled
{ {
get { return _Disabled; } get { return _Disabled; }
set set
{ {
if (Disabled == value)
return;
_Disabled = value; _Disabled = value;
if (_Disabled)
Pause(); Pause();
else
Play();
} }
} }
public static bool RepeatSong { get; set; } public static bool RepeatSong {
get { return _SongPlayer.RepeatSong; }
set { _SongPlayer.RepeatSong = value; }
}
public static int SongID public static int SongID
{ {
get { return _CurrentPlaylistElement == null ? -1 : _CurrentPlaylistElement.SongID; } get { return _SongPlayer.SongID; }
} }
public static bool SongHasVideo public static bool SongHasVideo
{ {
get { return _CurrentPlaylistElement != null && File.Exists(_CurrentPlaylistElement.VideoFilePath); } get { return _SongPlayer.SongHasVideo; }
} }
public static bool IsPlaying { get; private set; } public static bool IsPlaying { get { return _PlaysPreview ? _PreviewPlayer.IsPlaying : _SongPlayer.IsPlaying; } }
public static bool IsPlayingPreview { get { return _PlaysPreview; } }
public static string ArtistAndTitle public static string ArtistAndTitle
{ {
get get {
{ if (_PlaysPreview)
if (_CurrentPlaylistElement == null) return _PreviewPlayer.ArtistAndTitle;
return ""; else
if (_CurrentPlaylistElement.Artist != "" && _CurrentPlaylistElement.Title != "") return _BGMusicFiles.Contains(_CurrentPlaylistElement) ? Path.GetFileNameWithoutExtension(_CurrentPlaylistElement.MusicFilePath) : _SongPlayer.ArtistAndTitle;
return _CurrentPlaylistElement.Artist + " - " + _CurrentPlaylistElement.Title;
return Path.GetFileNameWithoutExtension(_CurrentPlaylistElement.MusicFilePath);
} }
} }
public static float Length
{
get { return _PlaysPreview ? _PreviewPlayer.Length : _SongPlayer.Length; }
}
public static CTexture Cover public static CTexture Cover
{ {
get { return _CurrentPlaylistElement == null ? CCover.NoCover : _CurrentPlaylistElement.Cover; } get { return _PlaysPreview ? _PreviewPlayer.Cover : _SongPlayer.Cover; }
} }
//Use this to set whether own songs are available for access //Use this to set whether own songs are available for access
@@ -135,7 +145,7 @@ namespace Vocaluxe.Base
if (_Initialized) if (_Initialized)
return; return;
List<string> soundFiles = CHelper.ListSoundFiles(CSettings.FolderBackgroundMusic, true, true); List<string> soundFiles = CHelper.ListSoundFiles(CSettings.FolderNameBackgroundMusic, true, true);
foreach (string path in soundFiles) foreach (string path in soundFiles)
_BGMusicFiles.Add(new CPlaylistElement(path)); _BGMusicFiles.Add(new CPlaylistElement(path));
@@ -143,8 +153,13 @@ namespace Vocaluxe.Base
_MusicSource = EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC; _MusicSource = EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC;
_AddBackgroundMusic(); _AddBackgroundMusic();
_PreviousMusicIndex = -1; _SongPlayer = new CSongPlayer();
IsPlaying = false; _SongPlayer.Volume = CConfig.BackgroundMusicVolume;
_PreviewPlayer = new CSongPlayer();
_PreviewPlayer.Volume = CConfig.PreviewMusicVolume;
_PreviewPlayer.RepeatSong = true;
_VideoEnabled = (CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON && CConfig.VideosToBackground == EOffOn.TR_CONFIG_ON); _VideoEnabled = (CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON && CConfig.VideosToBackground == EOffOn.TR_CONFIG_ON);
SetMusicSource(CConfig.BackgroundMusicSource); SetMusicSource(CConfig.BackgroundMusicSource);
_Initialized = true; _Initialized = true;
@@ -152,40 +167,27 @@ namespace Vocaluxe.Base
public static void Close() public static void Close()
{ {
if (_CurrentMusicStream >= 0) _SongPlayer.Stop();
{ _PreviewPlayer.Stop();
CSound.Close(_CurrentMusicStream);
_CurrentMusicStream = -1;
}
if (_Video != -1)
{
CVideo.Close(_Video);
CDraw.RemoveTexture(ref _CurrentVideoTexture);
_Video = -1;
}
_BGMusicFiles.Clear(); _BGMusicFiles.Clear();
_NotPlayedFiles.Clear(); _NotPlayedFiles.Clear();
_PreviousFiles.Clear(); _PreviousFiles.Clear();
IsPlaying = false;
_Initialized = false; _Initialized = false;
} }
public static void Play() public static void Play()
{ {
if (IsPlaying || CConfig.BackgroundMusic == EOffOn.TR_CONFIG_OFF) if (IsPlaying || (CConfig.BackgroundMusic != EBackgroundMusicOffOn.TR_CONFIG_ON && !_PlaysPreview))
return; return;
if (_CurrentMusicStream != -1) if (_PlaysPreview)
{ _PreviewPlayer.Play();
else if(CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_OFF)
if (_SongPlayer.SongLoaded)
//Resume //Resume
CSound.SetStreamVolume(_CurrentMusicStream, 0f); _SongPlayer.TogglePause();
CSound.Fade(_CurrentMusicStream, 100f, CSettings.BackgroundMusicFadeTime);
CSound.Play(_CurrentMusicStream);
if (_VideoEnabled && _Video != -1)
CVideo.Resume(_Video);
IsPlaying = true;
}
else else
Next(); Next();
} }
@@ -195,34 +197,39 @@ namespace Vocaluxe.Base
if (!IsPlaying) if (!IsPlaying)
return; return;
if (_Video != -1) if (_PlaysPreview)
{ {
CVideo.Close(_Video); _PreviewPlayer.Stop();
CDraw.RemoveTexture(ref _CurrentVideoTexture); _PlaysPreview = false;
_Video = -1; Pause();
} }
CSound.FadeAndClose(_CurrentMusicStream, 0f, CSettings.BackgroundMusicFadeTime); else
_CurrentMusicStream = -1; {
_SongPlayer.Stop();
_CurrentPlaylistElement = null; _CurrentPlaylistElement = null;
IsPlaying = false; }
} }
public static void Pause() public static void Pause()
{ {
if (!IsPlaying) if (_PlaysPreview)
return;
if (_Video != -1)
{ {
CVideo.Pause(_Video); if (!_PreviewPlayer.SongLoaded)
CVideo.Skip(_Video, CSound.GetPosition(_CurrentMusicStream) + CSettings.BackgroundMusicFadeTime, _CurrentPlaylistElement.VideoGap); return;
_PreviewPlayer.TogglePause();
}
else if (CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_ON)
{
if (!_SongPlayer.SongLoaded)
Next();
else
_SongPlayer.TogglePause();
} }
CSound.FadeAndPause(_CurrentMusicStream, 0f, CSettings.BackgroundMusicFadeTime);
IsPlaying = false;
} }
public static void Next() public static void Next()
{
if (!_PlaysPreview)
{ {
Stop(); //stop last song if any Stop(); //stop last song if any
if (_PreviousMusicIndex < _PreviousFiles.Count - 2) if (_PreviousMusicIndex < _PreviousFiles.Count - 2)
@@ -248,68 +255,45 @@ namespace Vocaluxe.Base
_PreviousMusicIndex = _PreviousFiles.Count - 1; _PreviousMusicIndex = _PreviousFiles.Count - 1;
} }
_StartSong(); _StartSong();
CanSing = !_IsBackgroundFile(_CurrentPlaylistElement); }
} }
public static void Previous() public static void Previous()
{
if (!_PlaysPreview)
{ {
if (_PreviousMusicIndex < 0) if (_PreviousMusicIndex < 0)
return; return;
Debug.Assert(_CurrentMusicStream != -1 && _CurrentPlaylistElement != null); Debug.Assert(_CurrentPlaylistElement != null);
if (CSound.GetPosition(_CurrentMusicStream) <= 1.5f && _PreviousMusicIndex > 0) if (_SongPlayer.Position <= 1.5f && _PreviousMusicIndex > 0)
{ {
Stop(); //stop last song Stop(); //stop last song
_PreviousMusicIndex--; _PreviousMusicIndex--;
_CurrentPlaylistElement = _PreviousFiles[_PreviousMusicIndex]; _CurrentPlaylistElement = _PreviousFiles[_PreviousMusicIndex];
CanSing = !_IsBackgroundFile(_CurrentPlaylistElement);
} }
_StartSong(); _StartSong();
} }
}
public static void Update() public static void Update()
{ {
if (!IsPlaying) if (!IsPlaying && (!_SongPlayer.SongLoaded || !_PreviewPlayer.SongLoaded) )
return; return;
Debug.Assert(_CurrentMusicStream != -1 && _CurrentPlaylistElement != null);
float timeToPlay; if (_PlaysPreview)
if (Math.Abs(_CurrentPlaylistElement.Finish) < 0.001) _PreviewPlayer.Update();
{
//No End-Tag defined
float len = CSound.GetLength(_CurrentMusicStream);
timeToPlay = (len > 0f) ? len - CSound.GetPosition(_CurrentMusicStream) : CSettings.BackgroundMusicFadeTime + 1f;
}
else //End-Tag found
timeToPlay = _CurrentPlaylistElement.Finish - CSound.GetPosition(_CurrentMusicStream);
bool finished = CSound.IsFinished(_CurrentMusicStream);
if (timeToPlay <= CSettings.BackgroundMusicFadeTime || finished)
{
if (RepeatSong)
_StartSong();
else else
{
_SongPlayer.Update();
if (_SongPlayer.IsFinished)
Next(); Next();
} }
} }
public static CTexture GetVideoTexture() public static CTexture GetVideoTexture()
{ {
if (_Video == -1) return _PlaysPreview ? _PreviewPlayer.GetVideoTexture() : _SongPlayer.GetVideoTexture();
return null;
float vtime;
if (CVideo.GetFrame(_Video, ref _CurrentVideoTexture, CSound.GetPosition(_CurrentMusicStream), out vtime))
{
if (_VideoFading != null)
{
bool finished;
_CurrentVideoTexture.Color.A = _VideoFading.GetValue(out finished);
if (finished)
_VideoFading = null;
}
return _CurrentVideoTexture;
}
return null;
} }
public static void SetMusicSource(EBackgroundMusicSource source) public static void SetMusicSource(EBackgroundMusicSource source)
@@ -335,37 +319,74 @@ namespace Vocaluxe.Base
} }
} }
public static void LoadPreview(CSong song, float start = 0f)
{
if (!_PlaysPreview)
Pause();
else
StopPreview();
if (song == null)
return;
if (start == 0f)
start = song.Preview.StartTime;
_PlaysPreview = true;
_PreviewPlayer.Load(song, start);
float startposition = song.Preview.StartTime;
float length = _PreviewPlayer.Length;
if (song.Preview.Source == EDataSource.None)
startposition = length / 4f;
else if (startposition > length - 5f)
startposition = Math.Max(0f, Math.Min(length / 4f, length - 5f));
if (startposition >= 0.5f)
startposition -= 0.5f;
_PreviewPlayer.Position = startposition;
Play();
}
public static void PlayPreview(float start = -1f)
{
if (start > -1f)
_PreviewPlayer.Position = start;
Play();
}
public static void StopPreview()
{
_PreviewPlayer.Stop();
_PlaysPreview = false;
}
/// <summary> /// <summary>
/// (Re-)Starts the _CurrentPlaylistElement /// (Re-)Starts the _CurrentPlaylistElement
/// </summary> /// </summary>
private static void _StartSong() private static void _StartSong()
{ {
Debug.Assert(_CurrentPlaylistElement != null); Debug.Assert(_CurrentPlaylistElement != null);
//If we have an active stream, reuse it
if (_CurrentMusicStream < 0)
{
//otherwhise load
_CurrentMusicStream = CSound.Load(_CurrentPlaylistElement.MusicFilePath);
if (_CurrentMusicStream < 0)
return;
CSound.SetStreamVolume(_CurrentMusicStream, 0f);
CSound.Fade(_CurrentMusicStream, 100f, CSettings.BackgroundMusicFadeTime);
}
//Seek to #Start-Tag, if found
if (_CurrentPlaylistElement.Start > 0.001 && CConfig.BackgroundMusicUseStart == EOffOn.TR_CONFIG_ON)
CSound.SetPosition(_CurrentMusicStream, _CurrentPlaylistElement.Start);
if (_VideoEnabled) //If current song same as loaded restart only
{ if (_CurrentPlaylistElement.SongID == _SongPlayer.SongID && _SongPlayer.SongLoaded)
if (_Video != -1) _SongPlayer.Play();
//otherwhise load
if (_BGMusicFiles.Contains(_CurrentPlaylistElement))
_SongPlayer.LoadFile(_CurrentPlaylistElement.MusicFilePath, 0f, true);
else
{ {
//Seek to #Start-Tag, if found
float start = 0f;
if (_CurrentPlaylistElement.Start > 0.001 && CConfig.BackgroundMusicUseStart == EOffOn.TR_CONFIG_ON) if (_CurrentPlaylistElement.Start > 0.001 && CConfig.BackgroundMusicUseStart == EOffOn.TR_CONFIG_ON)
CVideo.Skip(_Video, 0f, _CurrentPlaylistElement.VideoGap + _CurrentPlaylistElement.Start); start = _CurrentPlaylistElement.Start;
else _SongPlayer.Load(CBase.Songs.GetSongByID(_CurrentPlaylistElement.SongID), start, true);
CVideo.Skip(_Video, 0f, _CurrentPlaylistElement.VideoGap);
}
else
_LoadVideo();
} }
} }
@@ -419,16 +440,5 @@ namespace Vocaluxe.Base
return _BGMusicFiles.Contains(element); return _BGMusicFiles.Contains(element);
} }
private static void _LoadVideo()
{
if (_Video != -1 || String.IsNullOrEmpty(_CurrentPlaylistElement.VideoFilePath))
return;
_Video = CVideo.Load(_CurrentPlaylistElement.VideoFilePath);
if (CConfig.BackgroundMusicUseStart == EOffOn.TR_CONFIG_ON)
CVideo.Skip(_Video, 0f, _CurrentPlaylistElement.VideoGap + _CurrentPlaylistElement.Start); //Use gap, otherwhise we will overwrite position in GetVideoTexture
else
CVideo.Skip(_Video, 0f, _CurrentPlaylistElement.VideoGap);
_VideoFading = new CFading(0f, 1f, 3f);
}
} }
} }
+16 -20
View File
@@ -46,11 +46,9 @@ namespace Vocaluxe.Base
private static bool _Initialized; private static bool _Initialized;
// Base file and folder names (formerly from CSettings but they can be changed) // Base file and folder names (formerly from CSettings but they can be changed)
private const string _FolderProfiles = "Profiles"; //Use ProfileFolders for access public static string FolderPlaylists = Path.Combine(CSettings.DataFolder, "Playlists");
private const string _FolderSongs = "Songs"; //Use SongFolders for access public static string FileHighscoreDB = Path.Combine(CSettings.DataFolder, "HighscoreDB.sqlite");
public static string FolderPlaylists = "Playlists"; private static string _FileConfig = Path.Combine(CSettings.DataFolder, "Config.xml");
public static string FileHighscoreDB = "HighscoreDB.sqlite";
private static string _FileConfig = "Config.xml";
// Debug // Debug
public static EDebugLevel DebugLevel = EDebugLevel.TR_CONFIG_OFF; public static EDebugLevel DebugLevel = EDebugLevel.TR_CONFIG_OFF;
@@ -99,7 +97,7 @@ namespace Vocaluxe.Base
public static EBufferSize AudioBufferSize = EBufferSize.B2048; public static EBufferSize AudioBufferSize = EBufferSize.B2048;
public static int AudioLatency; public static int AudioLatency;
private static int _BackgroundMusicVolume = 30; private static int _BackgroundMusicVolume = 30;
public static EOffOn BackgroundMusic = EOffOn.TR_CONFIG_ON; public static EBackgroundMusicOffOn BackgroundMusic = EBackgroundMusicOffOn.TR_CONFIG_ON;
public static EBackgroundMusicSource BackgroundMusicSource = EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC; public static EBackgroundMusicSource BackgroundMusicSource = EBackgroundMusicSource.TR_CONFIG_NO_OWN_MUSIC;
public static EOffOn BackgroundMusicUseStart = EOffOn.TR_CONFIG_ON; public static EOffOn BackgroundMusicUseStart = EOffOn.TR_CONFIG_ON;
private static int _PreviewMusicVolume = 50; private static int _PreviewMusicVolume = 50;
@@ -108,10 +106,10 @@ namespace Vocaluxe.Base
//Folders //Folders
public static readonly List<string> SongFolders = new List<string> public static readonly List<string> SongFolders = new List<string>
{ {
Path.Combine(Directory.GetCurrentDirectory(), _FolderSongs) Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameSongs)
#if INSTALLER #if INSTALLER
,Path.Combine(CSettings.DataPath, CSettings.FolderSongs); ,Path.Combine(CSettings.DataFolder, CSettings.FolderNameSongs);
#endif #endif
}; };
/// <summary> /// <summary>
@@ -121,9 +119,9 @@ namespace Vocaluxe.Base
public static readonly List<string> ProfileFolders = new List<string> public static readonly List<string> ProfileFolders = new List<string>
{ {
#if INSTALLER #if INSTALLER
Path.Combine(Environment.CurrentDirectory, CSettings.FolderProfiles), Path.Combine(Environment.CurrentDirectory, CSettings.FolderNameProfiles),
#endif #endif
Path.Combine(CSettings.DataPath, _FolderProfiles) Path.Combine(CSettings.DataFolder, CSettings.FolderNameProfiles)
}; };
// Game // Game
@@ -202,7 +200,7 @@ namespace Vocaluxe.Base
return; return;
// Init config file // Init config file
if (!File.Exists(Path.Combine(CSettings.DataPath, _FileConfig))) if (!File.Exists(_FileConfig))
SaveConfig(); SaveConfig();
else else
_LoadConfig(); _LoadConfig();
@@ -212,7 +210,7 @@ namespace Vocaluxe.Base
private static void _LoadConfig() private static void _LoadConfig()
{ {
CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(CSettings.DataPath, _FileConfig)); CXMLReader xmlReader = CXMLReader.OpenFile(_FileConfig);
if (xmlReader == null) if (xmlReader == null)
return; return;
@@ -357,7 +355,7 @@ namespace Vocaluxe.Base
XmlWriter writer = null; XmlWriter writer = null;
try try
{ {
writer = XmlWriter.Create(Path.Combine(CSettings.DataPath, _FileConfig), XMLSettings); writer = XmlWriter.Create(_FileConfig, XMLSettings);
writer.WriteStartDocument(); writer.WriteStartDocument();
writer.WriteStartElement("root"); writer.WriteStartElement("root");
@@ -373,7 +371,7 @@ namespace Vocaluxe.Base
writer.WriteElementString("Screens", Screen.AllScreens.Length.ToString()); writer.WriteElementString("Screens", Screen.AllScreens.Length.ToString());
writer.WriteElementString("PrimaryScreenResolution", Screen.PrimaryScreen.Bounds.Size.ToString()); writer.WriteElementString("PrimaryScreenResolution", Screen.PrimaryScreen.Bounds.Size.ToString());
writer.WriteElementString("Directory", Environment.CurrentDirectory); writer.WriteElementString("Directory", CSettings.ProgramFolder);
writer.WriteEndElement(); writer.WriteEndElement();
@@ -480,8 +478,8 @@ namespace Vocaluxe.Base
writer.WriteComment("AudioLatency from -500 to 500 ms"); writer.WriteComment("AudioLatency from -500 to 500 ms");
writer.WriteElementString("AudioLatency", AudioLatency.ToString()); writer.WriteElementString("AudioLatency", AudioLatency.ToString());
writer.WriteComment("Background Music: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn)))); writer.WriteComment("Background Music: " + CHelper.ListStrings(Enum.GetNames(typeof(EBackgroundMusicOffOn))));
writer.WriteElementString("BackgroundMusic", Enum.GetName(typeof(EOffOn), BackgroundMusic)); writer.WriteElementString("BackgroundMusic", Enum.GetName(typeof(EBackgroundMusicOffOn), BackgroundMusic));
writer.WriteComment("Background Music Volume from 0 to 100"); writer.WriteComment("Background Music Volume from 0 to 100");
writer.WriteElementString("BackgroundMusicVolume", BackgroundMusicVolume.ToString()); writer.WriteElementString("BackgroundMusicVolume", BackgroundMusicVolume.ToString());
@@ -806,10 +804,8 @@ namespace Vocaluxe.Base
//Check each parameter //Check each parameter
for (int i = 0; i < _Params.Count; i++) for (int i = 0; i < _Params.Count; i++)
{ {
//Switch parameter as lower case //Switch parameter to lower case
string param = _Params[i]; string param = _Params[i].ToLower();
param = param.ToLower();
string value = _Values[i]; string value = _Values[i];
+5 -5
View File
@@ -143,7 +143,7 @@ namespace Vocaluxe.Base
{ {
_CoverThemes.Clear(); _CoverThemes.Clear();
const string path = CSettings.FolderCover; string path = Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameCover);
List<string> files = CHelper.ListFiles(path, "*.xml"); List<string> files = CHelper.ListFiles(path, "*.xml");
foreach (string file in files) foreach (string file in files)
@@ -179,23 +179,23 @@ namespace Vocaluxe.Base
var ignoreList = new List<string>(); var ignoreList = new List<string>();
string coverPath = Path.Combine(CSettings.FolderCover, coverTheme.Folder); string coverPath = Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameCover, coverTheme.Folder);
List<string> files = CHelper.ListImageFiles(coverPath, true, true); List<string> files = CHelper.ListImageFiles(coverPath, true, true);
CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(CSettings.FolderCover, coverTheme.File)); CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameCover, coverTheme.File));
lock (_Covers) lock (_Covers)
{ {
if (xmlReader != null) if (xmlReader != null)
{ {
_Covers.Clear(); _Covers.Clear();
List<string> cover = xmlReader.GetValues("Cover"); List<string> cover = xmlReader.GetNames("//root/Cover/*");
foreach (string coverName in cover) foreach (string coverName in cover)
{ {
string name; string name;
string filePath; string filePath;
xmlReader.GetValue("//root/Cover/" + coverName + "/Name", out name, String.Empty); xmlReader.GetValue("//root/Cover/" + coverName + "/Name", out name, String.Empty);
xmlReader.GetValue("//root/Cover/" + coverName + "/Path", out filePath, String.Empty); xmlReader.GetValue("//root/Cover/" + coverName + "/Path", out filePath, String.Empty);
string coverFilePath = Path.Combine(CSettings.FolderCover, Path.Combine(coverTheme.Folder, filePath)); string coverFilePath = Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameCover, coverTheme.Folder, filePath);
if (!File.Exists(coverFilePath)) if (!File.Exists(coverFilePath))
continue; continue;
+3 -3
View File
@@ -32,9 +32,9 @@ namespace Vocaluxe.Base
public static bool Init() public static bool Init()
{ {
_HighscoreDB = new CHighscoreDB(Path.Combine(Environment.CurrentDirectory, CConfig.FileHighscoreDB)); _HighscoreDB = new CHighscoreDB(CConfig.FileHighscoreDB);
_CoverDB = new CCoverDB(Path.Combine(Environment.CurrentDirectory, CSettings.FileCoverDB)); _CoverDB = new CCoverDB(Path.Combine(CSettings.DataFolder, CSettings.FileNameCoverDB));
_ResourceDB = new CResourceDB(Path.Combine(Environment.CurrentDirectory, CSettings.FileCreditsRessourcesDB)); _ResourceDB = new CResourceDB(Path.Combine(CSettings.ProgramFolder, CSettings.FileNameCreditsRessourcesDB));
if (!_HighscoreDB.Init()) if (!_HighscoreDB.Init())
{ {
+10 -6
View File
@@ -60,6 +60,11 @@ namespace Vocaluxe.Base
get { return _CurrentScreen; } get { return _CurrentScreen; }
} }
public static EScreens NextScreen
{
get { return _NextScreen; }
}
#region public methods #region public methods
public static void Init() public static void Init()
{ {
@@ -335,7 +340,7 @@ namespace Vocaluxe.Base
bool popupVolumeControlAllowed = _CurrentScreen != EScreens.ScreenCredits && _CurrentScreen != EScreens.ScreenOptionsRecord; bool popupVolumeControlAllowed = _CurrentScreen != EScreens.ScreenCredits && _CurrentScreen != EScreens.ScreenOptionsRecord;
//Hide volume control for bg-music if bg-music is disabled //Hide volume control for bg-music if bg-music is disabled
if (popupVolumeControlAllowed && (_CurrentScreen != EScreens.ScreenSong || CSongs.Category == -1) if (popupVolumeControlAllowed && (_CurrentScreen != EScreens.ScreenSong || CSongs.Category == -1)
&& _CurrentScreen != EScreens.ScreenSing && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_OFF) && _CurrentScreen != EScreens.ScreenSing && CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_OFF)
popupVolumeControlAllowed = false; popupVolumeControlAllowed = false;
@@ -348,8 +353,7 @@ namespace Vocaluxe.Base
if (!eventsAvailable) if (!eventsAvailable)
keyEvent = inputKeyEvent; keyEvent = inputKeyEvent;
if (keyEvent.Key == Keys.Left || keyEvent.Key == Keys.Right || keyEvent.Key == Keys.Up || keyEvent.Key == Keys.Down || keyEvent.Key == Keys.NumPad0 || if (keyEvent.IsArrowKey() || keyEvent.Key == Keys.NumPad0 || keyEvent.Key == Keys.D0)
keyEvent.Key == Keys.D0)
{ {
_Cursor.Deactivate(); _Cursor.Deactivate();
@@ -392,13 +396,13 @@ namespace Vocaluxe.Base
if (popupPlayerControlAllowed && keyEvent.Key == Keys.Tab) if (popupPlayerControlAllowed && keyEvent.Key == Keys.Tab)
{ {
if (_CurrentPopupScreen == EPopupScreens.NoPopup && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON) if (_CurrentPopupScreen == EPopupScreens.NoPopup && CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_ON)
ShowPopup(EPopupScreens.PopupPlayerControl); ShowPopup(EPopupScreens.PopupPlayerControl);
else else
HidePopup(EPopupScreens.PopupPlayerControl); HidePopup(EPopupScreens.PopupPlayerControl);
} }
if (popupPlayerControlAllowed && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON) if (popupPlayerControlAllowed && CConfig.BackgroundMusic != EBackgroundMusicOffOn.TR_CONFIG_OFF)
{ {
if (keyEvent.Key == Keys.MediaNextTrack) if (keyEvent.Key == Keys.MediaNextTrack)
CBackgroundMusic.Next(); CBackgroundMusic.Next();
@@ -498,7 +502,7 @@ namespace Vocaluxe.Base
bool isOverPopupPlayerControl = CHelper.IsInBounds(_PopupScreens[(int)EPopupScreens.PopupPlayerControl].ScreenArea, mouseEvent); bool isOverPopupPlayerControl = CHelper.IsInBounds(_PopupScreens[(int)EPopupScreens.PopupPlayerControl].ScreenArea, mouseEvent);
if (popupPlayerControlAllowed && isOverPopupPlayerControl) if (popupPlayerControlAllowed && isOverPopupPlayerControl)
{ {
if (_CurrentPopupScreen == EPopupScreens.NoPopup && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON) if (_CurrentPopupScreen == EPopupScreens.NoPopup && CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_ON)
ShowPopup(EPopupScreens.PopupPlayerControl); ShowPopup(EPopupScreens.PopupPlayerControl);
} }
+3 -3
View File
@@ -74,7 +74,7 @@ namespace Vocaluxe.Base
_Languages = new List<SLanguage>(); _Languages = new List<SLanguage>();
var files = new List<string>(); var files = new List<string>();
files.AddRange(CHelper.ListFiles(CSettings.FolderLanguages, "*.xml", true, true)); files.AddRange(CHelper.ListFiles(CSettings.FolderNameLanguages, "*.xml", true, true));
foreach (string file in files) foreach (string file in files)
_LoadLanguageFile(file); _LoadLanguageFile(file);
@@ -168,7 +168,7 @@ namespace Vocaluxe.Base
private static bool _LoadLanguageEntries(CXMLReader xmlReader, out Dictionary<string, string> texts) private static bool _LoadLanguageEntries(CXMLReader xmlReader, out Dictionary<string, string> texts)
{ {
texts = new Dictionary<string, string>(); texts = new Dictionary<string, string>();
IEnumerable<string> names = xmlReader.GetAttributes("resources", "name"); IEnumerable<string> names = xmlReader.GetAttributes("//resources/string", "name");
foreach (string name in names) foreach (string name in names)
{ {
string value; string value;
@@ -214,7 +214,7 @@ namespace Vocaluxe.Base
private static void _LoadLanguageFile(string fileName) private static void _LoadLanguageFile(string fileName)
{ {
var lang = new SLanguage {LanguageFilePath = Path.Combine(CSettings.FolderLanguages, fileName)}; var lang = new SLanguage {LanguageFilePath = Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameLanguages, fileName)};
CXMLReader xmlReader = CXMLReader.OpenFile(lang.LanguageFilePath); CXMLReader xmlReader = CXMLReader.OpenFile(lang.LanguageFilePath);
if (xmlReader == null) if (xmlReader == null)
+6 -6
View File
@@ -42,7 +42,7 @@ namespace Vocaluxe.Base
{ {
if (_LogFile != null) if (_LogFile != null)
return; return;
_LogFile = new StreamWriter(Path.Combine(CSettings.DataPath, _LogFileName), false, Encoding.UTF8); _LogFile = new StreamWriter(Path.Combine(CSettings.DataFolder, _LogFileName), false, Encoding.UTF8);
_LogFile.WriteLine(_LogName + " " + CSettings.GetFullVersionText() + " " + DateTime.Now); _LogFile.WriteLine(_LogName + " " + CSettings.GetFullVersionText() + " " + DateTime.Now);
_LogFile.WriteLine("----------------------------------------"); _LogFile.WriteLine("----------------------------------------");
@@ -117,11 +117,11 @@ namespace Vocaluxe.Base
public static void Init() public static void Init()
{ {
_ErrorLog = new CErrorLogFile(CSettings.FileErrorLog, "Error-Log"); _ErrorLog = new CErrorLogFile(CSettings.FileNameErrorLog, "Error-Log");
_PerformanceLog = new CLogFile(CSettings.FilePerformanceLog, "Performance-Log"); _PerformanceLog = new CLogFile(CSettings.FileNamePerformanceLog, "Performance-Log");
_BenchmarkLog = new CLogFile(CSettings.FileBenchmarkLog, "Benchmark-Log"); _BenchmarkLog = new CLogFile(CSettings.FileNameBenchmarkLog, "Benchmark-Log");
_DebugLog = new CLogFile(CSettings.FileDebugLog, "Debug-Log"); _DebugLog = new CLogFile(CSettings.FileNameDebugLog, "Debug-Log");
_SongInfoLog = new CLogFile(CSettings.FileSongInfoLog, "Song-Information-Log"); _SongInfoLog = new CLogFile(CSettings.FileNameSongInfoLog, "Song-Information-Log");
_BenchmarkTimer = new Stopwatch[_MaxBenchmarks]; _BenchmarkTimer = new Stopwatch[_MaxBenchmarks];
for (int i = 0; i < _BenchmarkTimer.Length; i++) for (int i = 0; i < _BenchmarkTimer.Length; i++)
+107 -37
View File
@@ -76,6 +76,11 @@ namespace Vocaluxe.Base
return CConfig.BackgroundMusicVolume; return CConfig.BackgroundMusicVolume;
} }
public EBackgroundMusicOffOn GetBackgroundMusicStatus()
{
return CConfig.BackgroundMusic;
}
public int GetPreviewMusicVolume() public int GetPreviewMusicVolume()
{ {
return CConfig.PreviewMusicVolume; return CConfig.PreviewMusicVolume;
@@ -231,7 +236,7 @@ namespace Vocaluxe.Base
public string GetDataPath() public string GetDataPath()
{ {
return CSettings.DataPath; return CSettings.DataFolder;
} }
public float GetSlideShowImageTime() public float GetSlideShowImageTime()
@@ -243,6 +248,11 @@ namespace Vocaluxe.Base
{ {
return CSettings.SlideShowFadeTime; return CSettings.SlideShowFadeTime;
} }
public float GetSoundPlayerFadeTime()
{
return CSettings.SoundPlayerFadeTime;
}
} }
class CBtheme : ITheme class CBtheme : ITheme
@@ -335,11 +345,21 @@ namespace Vocaluxe.Base
return CBackgroundMusic.VideoEnabled; return CBackgroundMusic.VideoEnabled;
} }
public void SetStatus(bool disabled) public bool IsPlayingPreview()
{
return CBackgroundMusic.IsPlayingPreview;
}
public void SetDisabled(bool disabled)
{ {
CBackgroundMusic.Disabled = disabled; CBackgroundMusic.Disabled = disabled;
} }
public float GetLength()
{
return CBackgroundMusic.Length;
}
public void Next() public void Next()
{ {
CBackgroundMusic.Next(); CBackgroundMusic.Next();
@@ -360,6 +380,26 @@ namespace Vocaluxe.Base
CBackgroundMusic.Play(); CBackgroundMusic.Play();
} }
public void Stop()
{
CBackgroundMusic.Stop();
}
public void LoadPreview(CSong song, float start = 0f)
{
CBackgroundMusic.LoadPreview(song, start);
}
public void PlayPreview(float start = -1f)
{
CBackgroundMusic.PlayPreview(start);
}
public void StopPreview()
{
CBackgroundMusic.StopPreview();
}
public CTexture GetVideoTexture() public CTexture GetVideoTexture()
{ {
return CBackgroundMusic.GetVideoTexture(); return CBackgroundMusic.GetVideoTexture();
@@ -430,6 +470,11 @@ namespace Vocaluxe.Base
{ {
return CGraphics.GlobalAlpha; return CGraphics.GlobalAlpha;
} }
public EScreens GetNextScreen()
{
return CGraphics.NextScreen;
}
} }
class CBlog : ILog class CBlog : ILog
@@ -577,6 +622,16 @@ namespace Vocaluxe.Base
{ {
return CGame.GetNumSongs(); return CGame.GetNumSongs();
} }
public CSong GetSong()
{
return CGame.GetSong();
}
public CSong GetSong(int round)
{
return CGame.GetSong(round);
}
} }
class CBprofiles : IProfiles class CBprofiles : IProfiles
@@ -774,6 +829,16 @@ namespace Vocaluxe.Base
{ {
CVideo.SetLoop(streamID, loop); CVideo.SetLoop(streamID, loop);
} }
public void Pause(int streamID)
{
CVideo.Pause(streamID);
}
public void Resume(int streamID)
{
CVideo.Resume(streamID);
}
} }
class CBsound : ISound class CBsound : ISound
@@ -793,9 +858,14 @@ namespace Vocaluxe.Base
CSound.Play(soundStream); CSound.Play(soundStream);
} }
public void Fade(int soundStream, float targetVolume, float duration) public void Fade(int soundStream, float targetVolume, float duration, EStreamAction afterFadeAction = EStreamAction.Nothing)
{ {
CSound.Fade(soundStream, targetVolume, duration); CSound.Fade(soundStream, targetVolume, duration, afterFadeAction);
}
public void Close(int soundStream)
{
CSound.Close(soundStream);
} }
public bool IsFinished(int soundStream) public bool IsFinished(int soundStream)
@@ -813,11 +883,6 @@ namespace Vocaluxe.Base
return CSound.GetLength(soundStream); return CSound.GetLength(soundStream);
} }
public void FadeAndClose(int soundStream, float targetVolume, float duration)
{
CSound.FadeAndClose(soundStream, targetVolume, duration);
}
public void SetStreamVolume(int soundStream, float volume) public void SetStreamVolume(int soundStream, float volume)
{ {
CSound.SetStreamVolume(soundStream, volume); CSound.SetStreamVolume(soundStream, volume);
@@ -855,29 +920,34 @@ namespace Vocaluxe.Base
class CBplaylist : IPlaylist class CBplaylist : IPlaylist
{ {
public void SetPlaylistName(int playlistID, string name) public void SetName(int playlistID, string name)
{ {
CPlaylists.SetPlaylistName(playlistID, name); CPlaylists.SetName(playlistID, name);
} }
public List<string> GetPlaylistNames() public List<string> GetNames()
{ {
return CPlaylists.PlaylistNames; return CPlaylists.Names;
} }
public string GetPlaylistName(int playlistID) public bool Exists(int playlistID)
{ {
return CPlaylists.GetPlaylistName(playlistID); return CPlaylists.Get(playlistID) != null;
} }
public void DeletePlaylist(int playlistID) public string GetName(int playlistID)
{ {
CPlaylists.DeletePlaylist(playlistID); return CPlaylists.GetName(playlistID);
} }
public void SavePlaylist(int playlistID) public void Delete(int playlistID)
{ {
CPlaylists.SavePlaylist(playlistID); CPlaylists.Delete(playlistID);
}
public void Save(int playlistID)
{
CPlaylists.Save(playlistID);
} }
public int GetNumPlaylists() public int GetNumPlaylists()
@@ -885,49 +955,49 @@ namespace Vocaluxe.Base
return CPlaylists.NumPlaylists; return CPlaylists.NumPlaylists;
} }
public void AddPlaylistSong(int playlistID, int songID) public void AddSong(int playlistID, int songID)
{ {
CPlaylists.AddPlaylistSong(playlistID, songID); CPlaylists.AddSong(playlistID, songID);
} }
public void AddPlaylistSong(int playlistID, int songID, EGameMode gameMode) public void AddSong(int playlistID, int songID, EGameMode gameMode)
{ {
CPlaylists.AddPlaylistSong(playlistID, songID, gameMode); CPlaylists.AddSong(playlistID, songID, gameMode);
} }
public void InsertPlaylistSong(int playlistID, int positionIndex, int songID, EGameMode gameMode) public void InsertSong(int playlistID, int positionIndex, int songID, EGameMode gameMode)
{ {
CPlaylists.InsertPlaylistSong(playlistID, positionIndex, songID, gameMode); CPlaylists.InsertSong(playlistID, positionIndex, songID, gameMode);
} }
public void MovePlaylistSong(int playlistID, int sourceIndex, int destIndex) public void MoveSong(int playlistID, int sourceIndex, int destIndex)
{ {
CPlaylists.MovePlaylistSong(playlistID, sourceIndex, destIndex); CPlaylists.MoveSong(playlistID, sourceIndex, destIndex);
} }
public void MovePlaylistSongDown(int playlistID, int songIndex) public void MoveSongDown(int playlistID, int songIndex)
{ {
CPlaylists.MovePlaylistSongDown(playlistID, songIndex); CPlaylists.MovePSongDown(playlistID, songIndex);
} }
public void MovePlaylistSongUp(int playlistID, int songIndex) public void MoveSongUp(int playlistID, int songIndex)
{ {
CPlaylists.MovePlaylistSongUp(playlistID, songIndex); CPlaylists.MoveSongUp(playlistID, songIndex);
} }
public void DeletePlaylistSong(int playlistID, int songIndex) public void DeleteSong(int playlistID, int songIndex)
{ {
CPlaylists.DeletePlaylistSong(playlistID, songIndex); CPlaylists.DeleteSong(playlistID, songIndex);
} }
public int GetPlaylistSongCount(int playlistID) public int GetSongCount(int playlistID)
{ {
return CPlaylists.GetPlaylistSongCount(playlistID); return CPlaylists.GetSongCount(playlistID);
} }
public CPlaylistSong GetPlaylistSong(int playlistID, int songIndex) public CPlaylistSong GetSong(int playlistID, int songIndex)
{ {
return CPlaylists.GetPlaylistSong(playlistID, songIndex); return CPlaylists.GetSong(playlistID, songIndex);
} }
} }
} }
+8 -7
View File
@@ -218,7 +218,7 @@ namespace Vocaluxe.Base
private static void _LoadPartyModes() private static void _LoadPartyModes()
{ {
var files = new List<string>(); var files = new List<string>();
files.AddRange(CHelper.ListFiles(CSettings.FolderPartyModes, "*.xml", false, true)); files.AddRange(CHelper.ListFiles(CSettings.FolderNamePartyModes, "*.xml", false, true));
foreach (string file in files) foreach (string file in files)
{ {
@@ -246,10 +246,10 @@ namespace Vocaluxe.Base
loaded &= xmlReader.GetValue("//root/Info/Author", out pm.Author, "ERROR Author"); loaded &= xmlReader.GetValue("//root/Info/Author", out pm.Author, "ERROR Author");
loaded &= xmlReader.GetValue("//root/Info/Folder", out pm.Folder, "ERROR Folder"); loaded &= xmlReader.GetValue("//root/Info/Folder", out pm.Folder, "ERROR Folder");
loaded &= xmlReader.GetValue("//root/Info/PartyModeFile", out pm.PartyModeFile, "ERROR PartyModeFile"); loaded &= xmlReader.GetValue("//root/Info/PartyModeFile", out pm.PartyModeFile, "ERROR PartyModeFile");
loaded &= xmlReader.GetInnerValues("PartyScreens", ref pm.ScreenFiles);
loaded &= xmlReader.TryGetIntValue("//root/Info/PartyModeVersionMajor", ref pm.PartyModeVersionMajor); loaded &= xmlReader.TryGetIntValue("//root/Info/PartyModeVersionMajor", ref pm.PartyModeVersionMajor);
loaded &= xmlReader.TryGetIntValue("//root/Info/PartyModeVersionMinor", ref pm.PartyModeVersionMinor); loaded &= xmlReader.TryGetIntValue("//root/Info/PartyModeVersionMinor", ref pm.PartyModeVersionMinor);
loaded &= xmlReader.GetValue("//root/Info/TargetAudience", out pm.TargetAudience, "ERROR TargetAudience"); loaded &= xmlReader.GetValue("//root/Info/TargetAudience", out pm.TargetAudience, "ERROR TargetAudience");
loaded &= xmlReader.GetValues("//root/PartyScreens/*", ref pm.ScreenFiles);
if (!loaded) if (!loaded)
{ {
@@ -269,7 +269,8 @@ namespace Vocaluxe.Base
return pm; return pm;
} }
string pathToCode = Path.Combine(Path.Combine(CSettings.FolderPartyModes, pm.Folder), CSettings.FolderPartyModeCode); string pathToPm = Path.Combine(CSettings.ProgramFolder, CSettings.FolderNamePartyModes, pm.Folder);
string pathToCode = Path.Combine(pathToPm, CSettings.FolderNamePartyModeCode);
var filesToCompile = new List<string>(); var filesToCompile = new List<string>();
filesToCompile.AddRange(CHelper.ListFiles(pathToCode, "*.cs", false, true)); filesToCompile.AddRange(CHelper.ListFiles(pathToCode, "*.cs", false, true));
@@ -278,7 +279,7 @@ namespace Vocaluxe.Base
if (output == null) if (output == null)
return pm; return pm;
if (!CLanguage.LoadPartyLanguageFiles(pm.PartyModeID, Path.Combine(Path.Combine(CSettings.FolderPartyModes, pm.Folder), CSettings.FolderPartyModeLanguages))) if (!CLanguage.LoadPartyLanguageFiles(pm.PartyModeID, Path.Combine(pathToPm, CSettings.FolderNamePartyModeLanguages)))
{ {
CLog.LogError("Error loading language files for PartyMode: " + file); CLog.LogError("Error loading language files for PartyMode: " + file);
return pm; return pm;
@@ -301,9 +302,9 @@ namespace Vocaluxe.Base
return pm; return pm;
} }
pm.PartyMode.Initialize(); pm.PartyMode.Initialize();
pm.PartyMode.SetFolder(Path.Combine(Directory.GetCurrentDirectory(), Path.Combine(CSettings.FolderPartyModes, pm.Folder))); pm.PartyMode.SetFolder(pathToPm);
if (!CTheme.AddTheme(Path.Combine(pm.PartyMode.GetFolder(), "Theme.xml"), pm.PartyModeID)) if (!CTheme.AddTheme(Path.Combine(pathToPm, "Theme.xml"), pm.PartyModeID))
return pm; return pm;
int themeIndex = CTheme.GetThemeIndex(pm.PartyModeID); int themeIndex = CTheme.GetThemeIndex(pm.PartyModeID);
@@ -318,7 +319,7 @@ namespace Vocaluxe.Base
foreach (string screenfile in pm.ScreenFiles) foreach (string screenfile in pm.ScreenFiles)
{ {
string xmlPath = Path.Combine(Path.Combine(CSettings.FolderPartyModes, pm.Folder), CSettings.FolderPartyModeScreens); string xmlPath = Path.Combine(pathToPm, CSettings.FolderNamePartyModeScreens);
CMenuParty screen = _GetPartyScreenInstance(output, screenfile, pm.Folder); CMenuParty screen = _GetPartyScreenInstance(output, screenfile, pm.Folder);
if (screen != null) if (screen != null)
+86 -99
View File
@@ -31,15 +31,16 @@ namespace Vocaluxe.Base
static class CPlaylists static class CPlaylists
{ {
private static List<CPlaylistFile> _Playlists; private static List<CPlaylistFile> _Playlists;
private static int _NextID;
public static CPlaylistFile[] Playlists public static IEnumerable<CPlaylistFile> Playlists
{ {
get { return _Playlists.ToArray(); } get { return _Playlists.AsReadOnly(); }
} }
public static List<string> PlaylistNames public static List<string> Names
{ {
get { return _Playlists.Select(t => t.PlaylistName).ToList(); } get { return _Playlists.Select(t => t.Name).ToList(); }
} }
public static int NumPlaylists public static int NumPlaylists
@@ -49,176 +50,169 @@ namespace Vocaluxe.Base
public static void Init() public static void Init()
{ {
LoadPlaylists(); Load();
_ConvertUSDXPlaylists(); _ConvertUSDXPlaylists();
_SortPlaylistsByName(); _SortByName();
} }
private static void _ConvertUSDXPlaylists() private static void _ConvertUSDXPlaylists()
{ {
var files = new List<string>(); var files = new List<string>();
files.AddRange(CHelper.ListFiles(Path.Combine(CSettings.DataPath, CConfig.FolderPlaylists), "*.upl", true, true)); files.AddRange(CHelper.ListFiles(Path.Combine(CSettings.DataFolder, CConfig.FolderPlaylists), "*.upl", true, true));
foreach (string file in files) foreach (string file in files)
{ {
CPlaylistFile playlist = _ConvertUSDXPlaylist(file); CPlaylistFile playlist = _ConvertUSDXPlaylist(file);
playlist.SavePlaylist(); playlist.Save();
_Playlists.Add(playlist); _Playlists.Add(playlist);
} }
} }
public static void LoadPlaylists() public static void Load()
{ {
_Playlists = new List<CPlaylistFile>(); _Playlists = new List<CPlaylistFile>();
var files = new List<string>(); var files = new List<string>();
files.AddRange(CHelper.ListFiles(Path.Combine(CSettings.DataPath, CConfig.FolderPlaylists), "*.xml", true, true)); files.AddRange(CHelper.ListFiles(Path.Combine(CSettings.DataFolder, CConfig.FolderPlaylists), "*.xml", true, true));
foreach (string file in files) foreach (string file in files)
{ {
CPlaylistFile playlist = new CPlaylistFile(file, files.IndexOf(file)); CPlaylistFile playlist = new CPlaylistFile(files.IndexOf(file), file);
_Playlists.Add(playlist); _Playlists.Add(playlist);
} }
} }
public static string GetPlaylistName(int playlistID) public static CPlaylistFile Get(int playlistID)
{ {
if (playlistID >= _Playlists.Count || playlistID < 0) return _Playlists.FirstOrDefault(pl => pl.Id == playlistID);
return "Error: Can't find Playlist";
return _Playlists[playlistID].PlaylistName;
} }
public static void SetPlaylistName(int playlistID, string name) public static string GetName(int playlistID)
{ {
if (playlistID >= _Playlists.Count || playlistID < 0) CPlaylistFile pl = Get(playlistID);
return; return pl == null ? "Error: Can't find Playlist" : pl.Name;
_Playlists[playlistID].PlaylistName = name;
} }
public static void DeletePlaylist(int playlistID) public static void SetName(int playlistID, string name)
{ {
if (playlistID < 0 || playlistID >= _Playlists.Count) CPlaylistFile pl = Get(playlistID);
if (pl != null)
pl.Name = name;
}
public static void Delete(int playlistID)
{
CPlaylistFile pl = Get(playlistID);
if (pl == null)
return; return;
if (_Playlists[playlistID].PlaylistFile != "") if (pl.File != "" && File.Exists(pl.File))
{ {
try try
{ {
File.Delete(_Playlists[playlistID].PlaylistFile); File.Delete(pl.File);
} }
catch (Exception) catch (Exception)
{ {
CLog.LogError("Can't delete Playlist File " + _Playlists[playlistID].PlaylistFile + ".xml"); CLog.LogError("Can't delete Playlist File " + _Playlists[playlistID].File + ".xml");
} }
} }
_Playlists.RemoveAt(playlistID); _Playlists.Remove(pl);
} }
public static void SavePlaylist(int playlistID) public static void Save(int playlistID)
{ {
if (playlistID < 0 || playlistID >= _Playlists.Count) CPlaylistFile pl = Get(playlistID);
return; if (pl != null)
_Playlists[playlistID].SavePlaylist(); pl.Save();
} }
public static int NewPlaylist() public static int NewPlaylist(string name = "New Playlist")
{ {
CPlaylistFile pl = new CPlaylistFile {PlaylistName = "New Playlist", Id = _Playlists.Count}; CPlaylistFile pl = new CPlaylistFile(_NextID++) {Name = name};
_Playlists.Add(pl); _Playlists.Add(pl);
return _Playlists.Count - 1; return pl.Id;
} }
public static void AddPlaylistSong(int playlistID, int songID) public static void AddSong(int playlistID, int songID)
{ {
if (playlistID >= _Playlists.Count || playlistID < 0) CPlaylistFile pl = Get(playlistID);
return; if (pl != null)
pl.AddSong(songID);
_Playlists[playlistID].AddSong(songID);
} }
public static void AddPlaylistSong(int playlistID, int songID, EGameMode gameMode) public static void AddSong(int playlistID, int songID, EGameMode gameMode)
{ {
if (playlistID >= _Playlists.Count || playlistID < 0) CPlaylistFile pl = Get(playlistID);
return; if (pl != null)
pl.AddSong(songID, gameMode);
_Playlists[playlistID].AddSong(songID, gameMode);
} }
public static void InsertPlaylistSong(int playlistID, int positionIndex, int songID, EGameMode gameMode) public static void InsertSong(int playlistID, int positionIndex, int songID, EGameMode gameMode)
{ {
if (playlistID >= _Playlists.Count || playlistID < 0) CPlaylistFile pl = Get(playlistID);
return; if (pl != null)
pl.InsertSong(positionIndex, songID, gameMode);
_Playlists[playlistID].SongInsert(positionIndex, songID, gameMode);
} }
public static void MovePlaylistSong(int playlistID, int sourceIndex, int destIndex) public static void MoveSong(int playlistID, int sourceIndex, int destIndex)
{ {
if (playlistID >= _Playlists.Count || playlistID < 0) CPlaylistFile pl = Get(playlistID);
return; if (pl != null)
pl.MoveSong(sourceIndex, destIndex);
_Playlists[playlistID].SongMove(sourceIndex, destIndex);
} }
public static void MovePlaylistSongDown(int playlistID, int songIndex) public static void MovePSongDown(int playlistID, int songIndex)
{ {
if (playlistID >= _Playlists.Count || playlistID < 0) CPlaylistFile pl = Get(playlistID);
return; if (pl != null)
pl.MoveSongDown(songIndex);
_Playlists[playlistID].SongDown(songIndex);
} }
public static void MovePlaylistSongUp(int playlistID, int songIndex) public static void MoveSongUp(int playlistID, int songIndex)
{ {
if (playlistID >= _Playlists.Count || playlistID < 0) CPlaylistFile pl = Get(playlistID);
return; if (pl != null)
pl.MoveSongUp(songIndex);
_Playlists[playlistID].SongUp(songIndex);
} }
public static void DeletePlaylistSong(int playlistID, int songIndex) public static void DeleteSong(int playlistID, int songIndex)
{ {
if (playlistID >= _Playlists.Count || playlistID < 0) CPlaylistFile pl = Get(playlistID);
return; if (pl != null)
pl.DeleteSong(songIndex);
_Playlists[playlistID].DeleteSong(songIndex);
} }
public static int GetPlaylistSongCount(int playlistID) public static int GetSongCount(int playlistID)
{ {
if (playlistID >= _Playlists.Count || playlistID < 0) CPlaylistFile pl = Get(playlistID);
return 0; return pl != null ? pl.Songs.Count : -1;
return _Playlists[playlistID].Songs.Count;
} }
public static CPlaylistSong GetPlaylistSong(int playlistID, int songIndex) public static CPlaylistSong GetSong(int playlistID, int songIndex)
{ {
if (playlistID >= _Playlists.Count || playlistID < 0) CPlaylistFile pl = Get(playlistID);
if (pl == null || songIndex >= pl.Songs.Count)
return null; return null;
if (songIndex >= _Playlists[playlistID].Songs.Count) return pl.Songs[songIndex];
return null;
return _Playlists[playlistID].Songs[songIndex];
} }
#region private methods #region private methods
private static void _SortPlaylistsByName() private static void _SortByName()
{ {
_Playlists.Sort(_CompareByPlaylistName); _Playlists.Sort(_CompareByName);
} }
private static int _CompareByPlaylistName(CPlaylistFile a, CPlaylistFile b) private static int _CompareByName(CPlaylistFile a, CPlaylistFile b)
{ {
return String.CompareOrdinal(a.PlaylistName, b.PlaylistName); return String.CompareOrdinal(a.Name, b.Name);
} }
private static CPlaylistFile _ConvertUSDXPlaylist(string file) private static CPlaylistFile _ConvertUSDXPlaylist(string file)
{ {
var pl = new CPlaylistFile(); var pl = new CPlaylistFile(_NextID++);
ReadOnlyCollection<CSong> allSongs = CSongs.AllSongs; ReadOnlyCollection<CSong> allSongs = CSongs.AllSongs;
if (!File.Exists(file)) if (!File.Exists(file))
@@ -234,30 +228,23 @@ namespace Vocaluxe.Base
int pos = line.IndexOf(":", StringComparison.Ordinal); int pos = line.IndexOf(":", StringComparison.Ordinal);
if (pos <= 0) if (pos <= 0)
continue; continue;
//Name or comment
if (line[0] == '#') if (line[0] == '#')
{ {
//Name or comment
string identifier = line.Substring(1, pos - 1).Trim(); string identifier = line.Substring(1, pos - 1).Trim();
string value = line.Substring(pos + 1, line.Length - pos - 1).Trim(); string value = line.Substring(pos + 1, line.Length - pos - 1).Trim();
if (identifier.ToUpper() == "NAME") if (identifier.ToUpper() == "NAME")
pl.PlaylistName = value; pl.Name = value;
} }
//Song
else else
{ {
//Song
string artist = line.Substring(0, pos - 1).Trim(); string artist = line.Substring(0, pos - 1).Trim();
string title = line.Substring(pos + 1, line.Length - pos - 1).Trim(); string title = line.Substring(pos + 1, line.Length - pos - 1).Trim();
bool found = false; CSong plSong = allSongs.FirstOrDefault(song => song.Artist == artist && song.Title == title);
foreach (CSong song in allSongs) if (plSong != null)
{ pl.AddSong(plSong.ID);
if (song.Artist == artist && song.Title == title) else
{
pl.AddSong(song.ID);
found = true;
break;
}
}
if (!found)
CLog.LogError("Can't find song '" + title + "' from '" + artist + "' in playlist file: " + file); CLog.LogError("Can't find song '" + title + "' from '" + artist + "' in playlist file: " + file);
} }
} }
+44 -36
View File
@@ -71,45 +71,51 @@ namespace Vocaluxe.Base
public const int VertexBufferElements = 10000; public const int VertexBufferElements = 10000;
public static readonly string ProgramFolder = AppDomain.CurrentDomain.BaseDirectory;
#if INSTALLER #if INSTALLER
public static readonly string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Vocaluxe"); public static readonly string DataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Vocaluxe");
#else #else
public static readonly string DataPath = Environment.CurrentDirectory; public static readonly string DataFolder = ProgramFolder;
#endif #endif
public const string Icon = "Vocaluxe.ico";
public const string Logo = "Logo.png";
public const string FallbackLanguage = "English"; public const string FallbackLanguage = "English";
public const string FileFonts = "Fonts.xml";
public const string FileOldHighscoreDB = "Ultrastar.db"; public const string FileNameIcon = "Vocaluxe.ico";
public const string FileCoverDB = "CoverDB.sqlite"; public const string FileNameLogo = "Logo.png";
public const string FileCreditsRessourcesDB = "CreditsRessourcesDB.sqlite"; public const string FileNameFonts = "Fonts.xml";
public const string FilePerformanceLog = "Performance.log";
public const string FileErrorLog = "Error.log";
public const string FileBenchmarkLog = "Benchmark.log";
public const string FileDebugLog = "Debug.log";
public const string FileSongInfoLog = "SongInformation.log";
public const string SoundT440 = "440Hz.mp3"; public const string FileNameOldHighscoreDB = "Ultrastar.db";
public const string FileNameCoverDB = "CoverDB.sqlite";
public const string FileNameCreditsRessourcesDB = "CreditsRessourcesDB.sqlite";
public const string FolderCover = "Cover"; public const string FileNamePerformanceLog = "Performance.log";
public const string FolderGraphics = "Graphics"; public const string FileNameErrorLog = "Error.log";
public const string FolderFonts = "Fonts"; public const string FileNameBenchmarkLog = "Benchmark.log";
public const string FolderThemes = "Themes"; public const string FileNameDebugLog = "Debug.log";
public const string FolderThemeFonts = "Fonts"; public const string FileNameSongInfoLog = "SongInformation.log";
public const string FolderScreens = "Screens";
public const string FolderPhotos = "Photos";
public const string FolderSounds = "Sounds";
public const string FolderLanguages = "Languages";
public const string FolderScreenshots = "Screenshots";
public const string FolderBackgroundMusic = "BackgroundMusic";
public const string FolderPartyModes = "PartyModes"; public const string FileNameSoundT440 = "440Hz.mp3";
public const string FolderPartyModeCode = "Code";
public const string FolderPartyModeScreens = "Screens"; public const string FolderNameSongs = "Songs";
public const string FolderPartyModeLanguages = "Languages"; public const string FolderNameProfiles = "Profiles";
public const string FolderPartyModeFonts = "Fonts"; public const string FolderNameCover = "Cover";
public const string FolderNameGraphics = "Graphics";
public const string FolderNameFonts = "Fonts";
public const string FolderNameThemes = "Themes";
public const string FolderNameThemeFonts = "Fonts";
public const string FolderNameScreens = "Screens";
public const string FolderNamePhotos = "Photos";
public const string FolderNameSounds = "Sounds";
public const string FolderNameLanguages = "Languages";
public const string FolderNameScreenshots = "Screenshots";
public const string FolderNameBackgroundMusic = "BackgroundMusic";
public const string FolderNamePartyModes = "PartyModes";
public const string FolderNamePartyModeCode = "Code";
public const string FolderNamePartyModeScreens = "Screens";
public const string FolderNamePartyModeLanguages = "Languages";
public const string FolderNamePartyModeFonts = "Fonts";
public const string LinkAndroidApp = "https://build.phonegap.com/apps/639714/download/android/?qr_key=uY98ymvTr6K144RyTdhs"; public const string LinkAndroidApp = "https://build.phonegap.com/apps/639714/download/android/?qr_key=uY98ymvTr6K144RyTdhs";
public const string LinkSymbianApp = "https://build.phonegap.com/apps/639714/download/symbian/?qr_key=uY98ymvTr6K144RyTdhs"; public const string LinkSymbianApp = "https://build.phonegap.com/apps/639714/download/symbian/?qr_key=uY98ymvTr6K144RyTdhs";
@@ -145,6 +151,8 @@ namespace Vocaluxe.Base
public const float BackgroundMusicFadeTime = 0.5f; public const float BackgroundMusicFadeTime = 0.5f;
public const float PauseResetTime = 1f; public const float PauseResetTime = 1f;
public const float SoundPlayerFadeTime = 0.5f;
public const float SlideShowImageTime = 3500f; public const float SlideShowImageTime = 3500f;
public const float SlideShowFadeTime = 500f; public const float SlideShowFadeTime = 500f;
@@ -211,12 +219,12 @@ namespace Vocaluxe.Base
{ {
var folders = new List<string> var folders = new List<string>
{ {
Path.Combine(Environment.CurrentDirectory, FolderCover), Path.Combine(ProgramFolder, FolderNameCover),
Path.Combine(Environment.CurrentDirectory, FolderFonts), Path.Combine(ProgramFolder, FolderNameFonts),
Path.Combine(DataPath, FolderScreenshots), Path.Combine(DataFolder, FolderNameScreenshots),
Path.Combine(Environment.CurrentDirectory, FolderBackgroundMusic), Path.Combine(ProgramFolder, FolderNameBackgroundMusic),
Path.Combine(Environment.CurrentDirectory, FolderSounds), Path.Combine(ProgramFolder, FolderNameSounds),
Path.Combine(DataPath, CConfig.FolderPlaylists) Path.Combine(DataFolder, CConfig.FolderPlaylists)
}; };
folders.AddRange(CConfig.ProfileFolders); folders.AddRange(CConfig.ProfileFolders);
folders.AddRange(CConfig.SongFolders); folders.AddRange(CConfig.SongFolders);
+1 -1
View File
@@ -71,7 +71,7 @@ namespace Vocaluxe.Base
{ {
if (songPointer.SortString != "") if (songPointer.SortString != "")
{ {
if (lastCategory == null || songPointer.SortString != lastCategory.Name) if (lastCategory == null || String.Compare(songPointer.SortString, lastCategory.Name, StringComparison.CurrentCultureIgnoreCase) != 0)
{ {
lastCategory = new CCategory(songPointer.SortString); lastCategory = new CCategory(songPointer.SortString);
_Categories.Add(lastCategory); _Categories.Add(lastCategory);
+1 -1
View File
@@ -155,7 +155,7 @@ namespace Vocaluxe.Base
list.Add(new CSongPointer(song.ID, value)); list.Add(new CSongPointer(song.ID, value));
else else
{ {
if (list.Count == 0) if (values.Count == 0)
list.Add(new CSongPointer(song.ID, "")); list.Add(new CSongPointer(song.ID, ""));
else else
list.AddRange(values.Select(val => new CSongPointer(song.ID, val))); list.AddRange(values.Select(val => new CSongPointer(song.ID, val)));
+3 -3
View File
@@ -85,7 +85,7 @@ namespace Vocaluxe.Base
} }
#region Stream Handling #region Stream Handling
public static int Load(string media, bool loop=false, bool prescan=false) public static int Load(string media, bool loop = false, bool prescan = false)
{ {
return _Playback.Load(media, loop, prescan); return _Playback.Load(media, loop, prescan);
} }
@@ -176,11 +176,11 @@ namespace Vocaluxe.Base
#region Sounds #region Sounds
public static int PlaySound(ESounds sound, bool fade = true) public static int PlaySound(ESounds sound, bool fade = true)
{ {
string file = Path.Combine(Environment.CurrentDirectory, CSettings.FolderSounds); string file = Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameSounds);
switch (sound) switch (sound)
{ {
case ESounds.T440: case ESounds.T440:
file = Path.Combine(file, CSettings.SoundT440); file = Path.Combine(file, CSettings.FileNameSoundT440);
break; break;
default: default:
return -1; return -1;
+9 -9
View File
@@ -266,13 +266,13 @@ namespace Vocaluxe.Base
{ {
CFonts.LoadThemeFonts( CFonts.LoadThemeFonts(
_Themes[themeIndex].Name, _Themes[themeIndex].Name,
Path.Combine(Path.Combine(_Themes[themeIndex].Path, _Themes[themeIndex].SkinFolder), CSettings.FolderThemeFonts), Path.Combine(Path.Combine(_Themes[themeIndex].Path, _Themes[themeIndex].SkinFolder), CSettings.FolderNameThemeFonts),
xmlReader); xmlReader);
} }
else else
{ {
CFonts.LoadPartyModeFonts(_Themes[themeIndex].PartyModeID, CFonts.LoadPartyModeFonts(_Themes[themeIndex].PartyModeID,
Path.Combine(_Themes[themeIndex].Path, CSettings.FolderPartyModeFonts), Path.Combine(_Themes[themeIndex].Path, CSettings.FolderNamePartyModeFonts),
xmlReader); xmlReader);
} }
return true; return true;
@@ -385,11 +385,11 @@ namespace Vocaluxe.Base
{ {
_Themes.Clear(); _Themes.Clear();
string path = Path.Combine(Directory.GetCurrentDirectory(), CSettings.FolderThemes); string path = Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameThemes);
List<string> files = CHelper.ListFiles(path, "*.xml"); List<string> files = CHelper.ListFiles(path, "*.xml", false, true);
foreach (string file in files) foreach (string file in files)
AddTheme(Path.Combine(path, file), -1); AddTheme(file, -1);
} }
public static bool AddTheme(string filePath, int partyModeID) public static bool AddTheme(string filePath, int partyModeID)
@@ -485,12 +485,12 @@ namespace Vocaluxe.Base
skin.PartyModeID = theme.PartyModeID; skin.PartyModeID = theme.PartyModeID;
skin.SkinList = new Dictionary<string, CSkinElement>(); skin.SkinList = new Dictionary<string, CSkinElement>();
List<string> names = xmlReader.GetValues("Skins"); List<string> names = xmlReader.GetNames("//root/Skins/*");
foreach (string str in names) foreach (string str in names)
skin.SkinList[str] = new CSkinElement(); skin.SkinList[str] = new CSkinElement();
skin.VideoList = new Dictionary<string, CVideoSkinElement>(); skin.VideoList = new Dictionary<string, CVideoSkinElement>();
names = xmlReader.GetValues("Videos"); names = xmlReader.GetNames("//root/Videos/*");
foreach (string str in names) foreach (string str in names)
skin.VideoList[str] = new CVideoSkinElement(); skin.VideoList[str] = new CVideoSkinElement();
_Skins.Add(skin); _Skins.Add(skin);
@@ -546,7 +546,7 @@ namespace Vocaluxe.Base
if (themeIndex != -1) if (themeIndex != -1)
{ {
path = Path.Combine(_Themes[themeIndex].Path, _Themes[themeIndex].SkinFolder); path = Path.Combine(_Themes[themeIndex].Path, _Themes[themeIndex].SkinFolder);
path = Path.Combine(path, CSettings.FolderScreens); path = Path.Combine(path, CSettings.FolderNameScreens);
} }
else else
CLog.LogError("Can't find current Theme"); CLog.LogError("Can't find current Theme");
@@ -665,7 +665,7 @@ namespace Vocaluxe.Base
} }
var colorScheme = new List<SColorScheme>(); var colorScheme = new List<SColorScheme>();
List<string> names = xmlReader.GetValues("ColorSchemes"); List<string> names = xmlReader.GetNames("//root/ColorSchemes/*");
foreach (string str in names) foreach (string str in names)
{ {
var scheme = new SColorScheme {Name = str}; var scheme = new SColorScheme {Name = str};
-92
View File
@@ -15,8 +15,6 @@
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>. // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
#endregion #endregion
using System.Diagnostics;
using System.Drawing;
using Vocaluxe.Lib.Video; using Vocaluxe.Lib.Video;
using VocaluxeLib; using VocaluxeLib;
using VocaluxeLib.Draw; using VocaluxeLib.Draw;
@@ -115,94 +113,4 @@ namespace Vocaluxe.Base
#endregion VideoDecoder #endregion VideoDecoder
} }
class CVideoPlayer
{
private CTexture _VideoTexture;
private int _VideoStream;
private readonly Stopwatch _VideoTimer = new Stopwatch();
private bool _Finished;
private bool _Loaded;
public bool IsFinished
{
get { return _Finished || !_Loaded; }
}
public bool Loop
{
set { CVideo.SetLoop(_VideoStream, value); }
}
public void Load(string videoName)
{
_VideoStream = CVideo.Load(CTheme.GetVideoFilePath(videoName, -1));
_Loaded = true;
CVideo.Pause(_VideoStream);
}
public void Start()
{
_VideoTimer.Reset();
_Finished = false;
//CVideo.VdSkip(_VideoStream, 0f, 0f);
_VideoTimer.Start();
CVideo.Resume(_VideoStream);
}
public void Pause()
{
CVideo.Pause(_VideoStream);
_VideoTimer.Stop();
}
public void Resume()
{
CVideo.Resume(_VideoStream);
_VideoTimer.Start();
}
public void Draw()
{
if (!_Finished)
{
float videoTime = _VideoTimer.ElapsedMilliseconds / 1000f;
_Finished = CVideo.Finished(_VideoStream);
CVideo.GetFrame(_VideoStream, ref _VideoTexture, videoTime, out videoTime);
}
if (_VideoTexture == null)
return;
var bounds = new RectangleF(0f, 0f, CSettings.RenderW, CSettings.RenderH);
RectangleF rect;
CHelper.SetRect(bounds, out rect, _VideoTexture.OrigAspect, EAspect.Crop);
CDraw.DrawTexture(_VideoTexture, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, CSettings.ZFar / 4));
}
public void PreLoad()
{
bool paused = _VideoTimer.IsRunning;
if (paused)
CVideo.Resume(_VideoStream);
float videoTime = 0f;
while (_VideoTexture == null && videoTime < 1f)
{
float dummy;
CVideo.GetFrame(_VideoStream, ref _VideoTexture, 0, out dummy);
videoTime += 0.05f;
}
if (paused)
CVideo.Pause(_VideoStream);
}
public void Close()
{
CVideo.Close(_VideoStream);
CDraw.RemoveTexture(ref _VideoTexture);
_Loaded = false;
_Finished = false;
_VideoTimer.Reset();
}
}
} }
+97
View File
@@ -0,0 +1,97 @@
using System.Diagnostics;
using System.Drawing;
using VocaluxeLib;
using VocaluxeLib.Draw;
namespace Vocaluxe.Base
{
class CVideoPlayer
{
private CTexture _VideoTexture;
private int _VideoStream;
private readonly Stopwatch _VideoTimer = new Stopwatch();
private bool _Finished;
private bool _Loaded;
public bool IsFinished
{
get { return _Finished || !_Loaded; }
}
public bool Loop
{
set { CVideo.SetLoop(_VideoStream, value); }
}
public void Load(string videoName)
{
_VideoStream = CVideo.Load(CTheme.GetVideoFilePath(videoName, -1));
_Loaded = true;
CVideo.Pause(_VideoStream);
}
public void Start()
{
_VideoTimer.Reset();
_Finished = false;
//CVideo.VdSkip(_VideoStream, 0f, 0f);
_VideoTimer.Start();
CVideo.Resume(_VideoStream);
}
public void Pause()
{
CVideo.Pause(_VideoStream);
_VideoTimer.Stop();
}
public void Resume()
{
CVideo.Resume(_VideoStream);
_VideoTimer.Start();
}
public void Draw()
{
if (!_Finished)
{
float videoTime = _VideoTimer.ElapsedMilliseconds / 1000f;
_Finished = CVideo.Finished(_VideoStream);
CVideo.GetFrame(_VideoStream, ref _VideoTexture, videoTime, out videoTime);
}
if (_VideoTexture == null)
return;
var bounds = new RectangleF(0f, 0f, CSettings.RenderW, CSettings.RenderH);
RectangleF rect;
CHelper.SetRect(bounds, out rect, _VideoTexture.OrigAspect, EAspect.Crop);
CDraw.DrawTexture(_VideoTexture, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, CSettings.ZFar / 4));
}
public void PreLoad()
{
bool paused = _VideoTimer.IsRunning;
if (paused)
CVideo.Resume(_VideoStream);
float videoTime = 0f;
while (_VideoTexture == null && videoTime < 1f)
{
float dummy;
CVideo.GetFrame(_VideoStream, ref _VideoTexture, 0, out dummy);
videoTime += 0.05f;
}
if (paused)
CVideo.Pause(_VideoStream);
}
public void Close()
{
CVideo.Close(_VideoStream);
CDraw.RemoveTexture(ref _VideoTexture);
_Loaded = false;
_Finished = false;
_VideoTimer.Reset();
}
}
}
+2 -2
View File
@@ -341,11 +341,11 @@ namespace Vocaluxe.Base.Fonts
/// <returns></returns> /// <returns></returns>
private static void _LoadFontList() private static void _LoadFontList()
{ {
CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(CSettings.FolderFonts, CSettings.FileFonts)); CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameFonts, CSettings.FileNameFonts));
if (xmlReader == null) if (xmlReader == null)
return; return;
_LoadFontFiles(xmlReader, Path.Combine(Directory.GetCurrentDirectory(), CSettings.FolderFonts)); _LoadFontFiles(xmlReader, Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameFonts));
} }
/// <summary> /// <summary>
+32 -38
View File
@@ -342,7 +342,7 @@ namespace Vocaluxe.Base.Server
return false; return false;
string name = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss"); string name = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss");
string filePath = _SaveImage(photoData.Photo, name, CSettings.FolderPhotos); string filePath = _SaveImage(photoData.Photo, name, CSettings.FolderNamePhotos);
if (!string.IsNullOrEmpty(filePath)) if (!string.IsNullOrEmpty(filePath))
{ {
_PhotosOfThisRound.Add(filePath); _PhotosOfThisRound.Add(filePath);
@@ -461,20 +461,20 @@ namespace Vocaluxe.Base.Server
private static SPlaylistInfo _GetPlaylist(int playlistId) private static SPlaylistInfo _GetPlaylist(int playlistId)
{ {
if (CPlaylists.Playlists.Length <= playlistId || playlistId < 0) if (CPlaylists.Get(playlistId) == null)
throw new ArgumentException("invalid playlistId"); throw new ArgumentException("invalid playlistId");
return _GetPlaylistInfo(CPlaylists.Playlists[playlistId]); return _GetPlaylistInfo(CPlaylists.Get(playlistId));
} }
private static void _AddSongToPlaylist(int songId, int playlistId, bool allowDuplicates) private static void _AddSongToPlaylist(int songId, int playlistId, bool allowDuplicates)
{ {
if (CPlaylists.Playlists.Length <= playlistId || playlistId < 0) if (CPlaylists.Get(playlistId) == null)
throw new ArgumentException("invalid playlistId"); throw new ArgumentException("invalid playlistId");
if (allowDuplicates || !_PlaylistContainsSong(songId, playlistId)) if (allowDuplicates || !_PlaylistContainsSong(songId, playlistId))
{ {
CPlaylists.AddPlaylistSong(playlistId, songId); CPlaylists.AddSong(playlistId, songId);
CPlaylists.SavePlaylist(playlistId); CPlaylists.Save(playlistId);
} }
else else
throw new ArgumentException("song exists in this playlist"); throw new ArgumentException("song exists in this playlist");
@@ -482,45 +482,49 @@ namespace Vocaluxe.Base.Server
private static void _RemoveSongFromPlaylist(int position, int playlistId, int songId) private static void _RemoveSongFromPlaylist(int position, int playlistId, int songId)
{ {
if (CPlaylists.Playlists.Length <= playlistId || playlistId < 0) CPlaylistFile pl = CPlaylists.Get(playlistId);
if (pl == null)
throw new ArgumentException("invalid playlistId"); throw new ArgumentException("invalid playlistId");
if (!_PlaylistContainsSong(songId, playlistId)) if (!_PlaylistContainsSong(songId, playlistId))
throw new ArgumentException("invalid songId"); throw new ArgumentException("invalid songId");
if (position < 0 || CPlaylists.Playlists[playlistId].Songs.Count <= position if (position < 0 || pl.Songs.Count <= position
|| CPlaylists.Playlists[playlistId].Songs[position].SongID != songId) || pl.Songs[position].SongID != songId)
throw new ArgumentException("invalid position"); throw new ArgumentException("invalid position");
CPlaylists.Playlists[playlistId].DeleteSong(position); pl.DeleteSong(position);
CPlaylists.SavePlaylist(playlistId); pl.Save();
} }
private static void _MoveSongInPlaylist(int newPosition, int playlistId, int songId) private static void _MoveSongInPlaylist(int newPosition, int playlistId, int songId)
{ {
if (CPlaylists.Playlists.Length <= playlistId || playlistId < 0) CPlaylistFile pl = CPlaylists.Get(playlistId);
if (pl == null)
throw new ArgumentException("invalid playlistId"); throw new ArgumentException("invalid playlistId");
if (!_PlaylistContainsSong(songId, playlistId)) if (!_PlaylistContainsSong(songId, playlistId))
throw new ArgumentException("invalid songId"); throw new ArgumentException("invalid songId");
if (CPlaylists.Playlists[playlistId].Songs.Count < newPosition) if (pl.Songs.Count < newPosition)
throw new ArgumentException("invalid newPosition"); throw new ArgumentException("invalid newPosition");
int oldPosition = CPlaylists.Playlists[playlistId].Songs.FindIndex(s => s.SongID == songId); int oldPosition = pl.Songs.FindIndex(s => s.SongID == songId);
CPlaylists.MovePlaylistSong(playlistId, oldPosition, newPosition); pl.MoveSong(oldPosition, newPosition);
CPlaylists.SavePlaylist(playlistId); pl.Save();
} }
private static bool _PlaylistContainsSong(int songId, int playlistId) private static bool _PlaylistContainsSong(int songId, int playlistId)
{ {
if (CPlaylists.Playlists.Length <= playlistId || playlistId < 0) CPlaylistFile pl = CPlaylists.Get(playlistId);
if (pl == null)
throw new ArgumentException("invalid playlistId"); throw new ArgumentException("invalid playlistId");
return CPlaylists.Playlists[playlistId].Songs.Any(s => s.SongID == songId); return pl.Songs.Any(s => s.SongID == songId);
} }
private static SPlaylistSongInfo[] _GetPlaylistSongs(int playlistId) private static SPlaylistSongInfo[] _GetPlaylistSongs(int playlistId)
{ {
if (CPlaylists.Playlists.Length <= playlistId || playlistId < 0) CPlaylistFile pl = CPlaylists.Get(playlistId);
if (pl == null)
throw new ArgumentException("invalid playlistId"); throw new ArgumentException("invalid playlistId");
return _GetPlaylistSongInfos(CPlaylists.Playlists[playlistId]); return _GetPlaylistSongInfos(pl);
} }
private static SPlaylistSongInfo _GetPlaylistSongInfo(CPlaylistSong playlistSong, int playlistId, int playlistPos) private static SPlaylistSongInfo _GetPlaylistSongInfo(CPlaylistSong playlistSong, int playlistId, int playlistPos)
@@ -549,7 +553,7 @@ namespace Vocaluxe.Base.Server
return new SPlaylistInfo return new SPlaylistInfo
{ {
PlaylistId = playlist.Id, PlaylistId = playlist.Id,
PlaylistName = playlist.PlaylistName, PlaylistName = playlist.Name,
SongCount = playlist.Songs.Count, SongCount = playlist.Songs.Count,
LastChanged = DateTime.Now.ToLongDateString() LastChanged = DateTime.Now.ToLongDateString()
}; };
@@ -557,16 +561,15 @@ namespace Vocaluxe.Base.Server
private static void _RemovePlaylist(int playlistId) private static void _RemovePlaylist(int playlistId)
{ {
if (CPlaylists.Playlists.Length <= playlistId || playlistId < 0) if (CPlaylists.Get(playlistId) == null)
throw new ArgumentException("invalid playlistId"); throw new ArgumentException("invalid playlistId");
CPlaylists.DeletePlaylist(playlistId); CPlaylists.Delete(playlistId);
} }
private static int _AddPlaylist(string playlistName) private static int _AddPlaylist(string playlistName)
{ {
int newPlaylistId = CPlaylists.NewPlaylist(); int newPlaylistId = CPlaylists.NewPlaylist(playlistName);
CPlaylists.Playlists[newPlaylistId].PlaylistName = playlistName; CPlaylists.Save(newPlaylistId);
CPlaylists.SavePlaylist(newPlaylistId);
return newPlaylistId; return newPlaylistId;
} }
@@ -682,19 +685,10 @@ namespace Vocaluxe.Base.Server
if (!Directory.Exists(folder)) if (!Directory.Exists(folder))
Directory.CreateDirectory(folder); Directory.CreateDirectory(folder);
string filename = Path.Combine(folder, name); string file = CHelper.GetUniqueFileName(folder, name + "." + extension);
if (File.Exists(filename + "." + extension))
{
int i = 0;
while (File.Exists(filename + "_" + i + "." + extension))
i++;
filename = filename + "_" + i + "." + extension;
}
else
filename = filename + "." + extension;
avatarImage.Save(filename); avatarImage.Save(file);
return filename; return file;
} }
} }
} }
+2 -2
View File
@@ -29,7 +29,7 @@ namespace Vocaluxe
public CSplashScreen() public CSplashScreen()
{ {
string path = Path.Combine(Environment.CurrentDirectory, Path.Combine(CSettings.FolderGraphics, CSettings.Logo)); string path = Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameGraphics, CSettings.FileNameLogo);
if (File.Exists(path)) if (File.Exists(path))
{ {
try try
@@ -45,7 +45,7 @@ namespace Vocaluxe
else else
CLog.LogError("Can't find " + path); CLog.LogError("Can't find " + path);
path = Path.Combine(Environment.CurrentDirectory, CSettings.Icon); path = Path.Combine(CSettings.ProgramFolder, CSettings.FileNameIcon);
if (File.Exists(path)) if (File.Exists(path))
{ {
try try
+1 -1
View File
@@ -47,7 +47,7 @@ namespace Vocaluxe.Lib.Database
public override bool Init() public override bool Init()
{ {
string oldDBFilePath = Path.Combine(Environment.CurrentDirectory, CSettings.FileOldHighscoreDB); string oldDBFilePath = Path.Combine(CSettings.DataFolder, CSettings.FileNameOldHighscoreDB);
if (File.Exists(oldDBFilePath)) if (File.Exists(oldDBFilePath))
{ {
if (File.Exists(_FilePath)) if (File.Exists(_FilePath))
+1 -1
View File
@@ -119,7 +119,7 @@ namespace Vocaluxe.Lib.Database
{ {
foreach (string file in _FilesV1) foreach (string file in _FilesV1)
{ {
string filePath = Path.Combine(Environment.CurrentDirectory, file); string filePath = Path.Combine(CSettings.ProgramFolder, file);
if (!_AddImageToCreditsDB(filePath, transaction)) if (!_AddImageToCreditsDB(filePath, transaction))
{ {
transaction.Rollback(); transaction.Rollback();
+3 -9
View File
@@ -84,7 +84,7 @@ namespace Vocaluxe.Lib.Draw
/// </summary> /// </summary>
public CDirect3D() public CDirect3D()
{ {
Icon = new Icon(Path.Combine(Environment.CurrentDirectory, CSettings.Icon)); Icon = new Icon(Path.Combine(CSettings.ProgramFolder, CSettings.FileNameIcon));
//Fill Queue with 100000 IDs //Fill Queue with 100000 IDs
for (int i = 0; i < _MaxID; i++) for (int i = 0; i < _MaxID; i++)
@@ -320,7 +320,6 @@ namespace Vocaluxe.Lib.Draw
} }
else else
_DoResize(); _DoResize();
;
} }
/// <summary> /// <summary>
@@ -731,18 +730,13 @@ namespace Vocaluxe.Lib.Draw
/// </summary> /// </summary>
public void MakeScreenShot() public void MakeScreenShot()
{ {
const string file = "Screenshot_"; string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.bmp");
string path = Path.Combine(CSettings.DataPath, CSettings.FolderScreenshots);
int i = 0;
while (File.Exists(Path.Combine(path, file + i.ToString("00000") + ".bmp")))
i++;
//create a surface of the frame //create a surface of the frame
using (Surface surface = _Device.GetBackBuffer(0, 0)) using (Surface surface = _Device.GetBackBuffer(0, 0))
{ {
var screen = new Bitmap(Surface.ToStream(surface, ImageFileFormat.Bmp)); var screen = new Bitmap(Surface.ToStream(surface, ImageFileFormat.Bmp));
screen.Save(Path.Combine(path, file + i.ToString("00000") + ".bmp"), ImageFormat.Bmp); screen.Save(file, ImageFormat.Bmp);
screen.Dispose(); screen.Dispose();
} }
} }
+3 -8
View File
@@ -51,7 +51,7 @@ namespace Vocaluxe.Lib.Draw
public CDrawWinForm() public CDrawWinForm()
{ {
Icon = new Icon(Path.Combine(Environment.CurrentDirectory, CSettings.Icon)); Icon = new Icon(Path.Combine(CSettings.ProgramFolder, CSettings.FileNameIcon));
_Keys = new CKeys(); _Keys = new CKeys();
_Mouse = new CMouse(); _Mouse = new CMouse();
@@ -304,14 +304,9 @@ namespace Vocaluxe.Lib.Draw
public void MakeScreenShot() public void MakeScreenShot()
{ {
const string file = "Screenshot_"; string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.bmp");
string path = Path.Combine(CSettings.DataPath, CSettings.FolderScreenshots);
int i = 0; _Backbuffer.Save(file, ImageFormat.Png);
while (File.Exists(Path.Combine(path, file + i.ToString("00000") + ".png")))
i++;
_Backbuffer.Save(Path.Combine(path, file + i.ToString("00000") + ".png"), ImageFormat.Png);
} }
public void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2) public void DrawLine(int a, int r, int g, int b, int w, int x1, int y1, int x2, int y2)
+3 -8
View File
@@ -111,7 +111,7 @@ namespace Vocaluxe.Lib.Draw
public COpenGL() public COpenGL()
{ {
Icon = new Icon(Path.Combine(Environment.CurrentDirectory, CSettings.Icon)); Icon = new Icon(Path.Combine(CSettings.ProgramFolder, CSettings.FileNameIcon));
for (int i = 1; i < _MaxID; i++) for (int i = 1; i < _MaxID; i++)
_IDs.Enqueue(i); _IDs.Enqueue(i);
@@ -534,12 +534,7 @@ namespace Vocaluxe.Lib.Draw
public void MakeScreenShot() public void MakeScreenShot()
{ {
const string file = "Screenshot_"; string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.bmp");
string path = Path.Combine(CSettings.DataPath, CSettings.FolderScreenshots);
int i = 0;
while (File.Exists(Path.Combine(path, file + i.ToString("00000") + ".bmp")))
i++;
int width = GetScreenWidth(); int width = GetScreenWidth();
int height = GetScreenHeight(); int height = GetScreenHeight();
@@ -552,7 +547,7 @@ namespace Vocaluxe.Lib.Draw
screen.UnlockBits(bmpData); screen.UnlockBits(bmpData);
screen.RotateFlip(RotateFlipType.RotateNoneFlipY); screen.RotateFlip(RotateFlipType.RotateNoneFlipY);
screen.Save(Path.Combine(path, file + i.ToString("00000") + ".bmp"), ImageFormat.Bmp); screen.Save(file, ImageFormat.Bmp);
} }
} }
+41 -62
View File
@@ -18,6 +18,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Xml; using System.Xml;
using Vocaluxe.Base; using Vocaluxe.Base;
using VocaluxeLib; using VocaluxeLib;
@@ -28,31 +29,26 @@ namespace Vocaluxe.Lib.Playlist
{ {
public class CPlaylistFile public class CPlaylistFile
{ {
public string PlaylistName; public string Name = "";
public string PlaylistFile; public string File;
public int Id = -1; public readonly int Id = -1;
public List<CPlaylistSong> Songs = new List<CPlaylistSong>(); public List<CPlaylistSong> Songs = new List<CPlaylistSong>();
public CPlaylistFile() public CPlaylistFile(int id, string file = "")
{
PlaylistName = string.Empty;
PlaylistFile = string.Empty;
}
public CPlaylistFile(string file, int id)
{ {
Id = id; Id = id;
PlaylistFile = file; File = file;
_LoadPlaylist(); if (File != "")
_Load();
} }
public void SavePlaylist() public void Save()
{ {
if (PlaylistFile == "") if (File == "")
{ {
string filename = string.Empty; string filename = string.Empty;
// ReSharper disable LoopCanBeConvertedToQuery // ReSharper disable LoopCanBeConvertedToQuery
foreach (char chr in PlaylistName) foreach (char chr in Name)
// ReSharper restore LoopCanBeConvertedToQuery // ReSharper restore LoopCanBeConvertedToQuery
{ {
if (char.IsLetter(chr)) if (char.IsLetter(chr))
@@ -62,25 +58,17 @@ namespace Vocaluxe.Lib.Playlist
if (filename == "") if (filename == "")
filename = "1"; filename = "1";
int i = 0; File = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CConfig.FolderPlaylists), filename + ".xml");
while (File.Exists(Path.Combine(CSettings.DataPath, CConfig.FolderPlaylists, filename + ".xml")))
{
i++;
if (!File.Exists(Path.Combine(CSettings.DataPath, CConfig.FolderPlaylists, filename + i + ".xml")))
filename += i;
}
PlaylistFile = Path.Combine(CSettings.DataPath, CConfig.FolderPlaylists, filename + ".xml");
} }
XmlWriter writer; XmlWriter writer;
try try
{ {
writer = XmlWriter.Create(PlaylistFile, CConfig.XMLSettings); writer = XmlWriter.Create(File, CConfig.XMLSettings);
} }
catch (Exception e) catch (Exception e)
{ {
CLog.LogError("Error creating/opening Playlist File " + PlaylistFile + ": " + e.Message); CLog.LogError("Error creating/opening Playlist File " + File + ": " + e.Message);
return; return;
} }
@@ -90,7 +78,7 @@ namespace Vocaluxe.Lib.Playlist
writer.WriteStartElement("root"); writer.WriteStartElement("root");
writer.WriteStartElement("Info"); writer.WriteStartElement("Info");
writer.WriteElementString("PlaylistName", PlaylistName); writer.WriteElementString("PlaylistName", Name);
writer.WriteEndElement(); writer.WriteEndElement();
writer.WriteStartElement("Songs"); writer.WriteStartElement("Songs");
@@ -121,51 +109,42 @@ namespace Vocaluxe.Lib.Playlist
} }
} }
private void _LoadPlaylist() private void _Load()
{ {
CXMLReader xmlReader = CXMLReader.OpenFile(PlaylistFile); CXMLReader xmlReader = CXMLReader.OpenFile(File);
if (xmlReader == null) if (xmlReader == null)
return; return;
string value = String.Empty; string value;
if (xmlReader.GetValue("//root/Info/PlaylistName", out value, value)) if (xmlReader.GetValue("//root/Info/PlaylistName", out value, ""))
{ {
PlaylistName = value; Name = value;
Songs = new List<CPlaylistSong>(); Songs = new List<CPlaylistSong>();
List<string> songs = xmlReader.GetValues("Songs"); List<string> songs = xmlReader.GetNames("//root/Songs/*");
var gm = EGameMode.TR_GAMEMODE_NORMAL;
foreach (string song in songs) foreach (string songEntry in songs)
{ {
string artist; string artist;
string title; string title;
xmlReader.GetValue("//root/Songs/" + song + "/Artist", out artist, String.Empty); xmlReader.GetValue("//root/Songs/" + songEntry + "/Artist", out artist, String.Empty);
xmlReader.GetValue("//root/Songs/" + song + "/Title", out title, String.Empty); xmlReader.GetValue("//root/Songs/" + songEntry + "/Title", out title, String.Empty);
xmlReader.TryGetEnumValue("//root/Songs/" + song + "/GameMode", ref gm); EGameMode gm = EGameMode.TR_GAMEMODE_NORMAL;
xmlReader.TryGetEnumValue("//root/Songs/" + songEntry + "/GameMode", ref gm);
var playlistSong = new CPlaylistSong {SongID = -1}; CSong plSong = CSongs.AllSongs.FirstOrDefault(song => song.Artist == artist && song.Title == title);
if (plSong != null)
foreach (CSong curSong in CSongs.AllSongs)
{ {
if (curSong.Artist != artist || curSong.Title != title) var playlistSong = new CPlaylistSong(plSong.ID, gm);
continue;
playlistSong.SongID = curSong.ID;
break;
}
if (playlistSong.SongID != -1)
{
playlistSong.GameMode = gm;
Songs.Add(playlistSong); Songs.Add(playlistSong);
} }
else else
CLog.LogError("Can't find song '" + title + "' from '" + artist + "' in playlist file: " + PlaylistFile); CLog.LogError("Can't find song '" + title + "' from '" + artist + "' in playlist file: " + File);
} }
} }
else else
CLog.LogError("Can't find PlaylistName in Playlist File: " + PlaylistFile); CLog.LogError("Can't find PlaylistName in Playlist File: " + File);
} }
public void AddSong(int songID) public void AddSong(int songID)
@@ -181,7 +160,7 @@ namespace Vocaluxe.Lib.Playlist
public void AddSong(int songID, EGameMode gm) public void AddSong(int songID, EGameMode gm)
{ {
var song = new CPlaylistSong {SongID = songID, GameMode = gm}; var song = new CPlaylistSong(songID, gm);
Songs.Add(song); Songs.Add(song);
} }
@@ -191,31 +170,31 @@ namespace Vocaluxe.Lib.Playlist
Songs.RemoveAt(songNr); Songs.RemoveAt(songNr);
} }
public void SongUp(int songNr) public void MoveSongUp(int songNr)
{ {
if (songNr < Songs.Count - 1 && songNr > 0) if (songNr < Songs.Count && songNr > 0)
Songs.Reverse(songNr - 1, 2); Songs.Reverse(songNr - 1, 2);
} }
public void SongDown(int songNr) public void MoveSongDown(int songNr)
{ {
if (songNr < Songs.Count - 1 && songNr >= 0) if (songNr < Songs.Count - 1 && songNr >= 0)
Songs.Reverse(songNr, 2); Songs.Reverse(songNr, 2);
} }
public void SongMove(int sourceNr, int destNr) public void MoveSong(int sourceNr, int destNr)
{ {
if (sourceNr < 0 || destNr < 0 || sourceNr == destNr || sourceNr > Songs.Count - 1 || destNr > Songs.Count - 1) if (sourceNr < 0 || destNr < 0 || sourceNr == destNr || sourceNr >= Songs.Count || destNr >= Songs.Count)
return; return;
var ps = new CPlaylistSong(Songs[sourceNr]); CPlaylistSong song = Songs[sourceNr];
Songs.RemoveAt(sourceNr); Songs.RemoveAt(sourceNr);
Songs.Insert(destNr, ps); Songs.Insert(destNr, song);
} }
public void SongInsert(int destNr, int songID, EGameMode gm) public void InsertSong(int destNr, int songID, EGameMode gm)
{ {
if (destNr < 0 || destNr > Songs.Count - 1) if (destNr < 0 || destNr >= Songs.Count)
return; return;
CPlaylistSong ps = new CPlaylistSong(songID, gm); CPlaylistSong ps = new CPlaylistSong(songID, gm);
@@ -142,10 +142,7 @@ namespace Vocaluxe.Lib.Sound.Playback
{ {
int index = _GetStreamIndex(streamID); int index = _GetStreamIndex(streamID);
if (index >= 0) if (index >= 0)
{
_Streams[index].Close(); _Streams[index].Close();
_Streams.RemoveAt(index);
}
} }
} }
@@ -16,6 +16,7 @@
#endregion #endregion
using System; using System;
using VocaluxeLib;
namespace Vocaluxe.Lib.Sound.Playback namespace Vocaluxe.Lib.Sound.Playback
{ {
+2 -7
View File
@@ -15,15 +15,10 @@
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>. // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
#endregion #endregion
using VocaluxeLib;
namespace Vocaluxe.Lib.Sound.Playback namespace Vocaluxe.Lib.Sound.Playback
{ {
public enum EStreamAction
{
Nothing,
Pause,
Stop,
Close
}
interface IPlayback interface IPlayback
{ {
+8 -9
View File
@@ -301,6 +301,7 @@ namespace Vocaluxe
if (args.Name.IndexOf(".resources", StringComparison.Ordinal) >= 0) if (args.Name.IndexOf(".resources", StringComparison.Ordinal) >= 0)
return null; return null;
Assembly assembly = null;
string[] arr = args.Name.Split(new char[] {','}); string[] arr = args.Name.Split(new char[] {','});
if (arr.Length > 0) if (arr.Length > 0)
{ {
@@ -311,27 +312,25 @@ namespace Vocaluxe
#if ARCH_X64 #if ARCH_X64
string path = "x64"; string path = "x64";
#endif #endif
path = Path.Combine(path, arr[0] + ".dll"); path = Path.Combine(CSettings.ProgramFolder, path, arr[0] + ".dll");
try
{
Assembly assembly;
try try
{ {
assembly = Assembly.LoadFrom(path); assembly = Assembly.LoadFrom(path);
} }
catch (FileLoadException) catch (FileLoadException e1)
{ {
//possibly loading from network, this would work always but better use the normal LoadFrom for more specific errors //possibly loading from network, this would work always but better use the normal LoadFrom for more specific errors
try
{
assembly = Assembly.Load(File.ReadAllBytes(path)); assembly = Assembly.Load(File.ReadAllBytes(path));
} }
return assembly;
}
catch (Exception e) catch (Exception e)
{ {
CLog.LogError("Cannot load assembly " + args.Name + " from " + path + ": " + e); CLog.LogError("Cannot load assembly " + args.Name + " from " + path + ": " + e + "\r\nOuter Error: " + e1);
} }
} }
return null; }
return assembly;
} }
private static readonly Mutex _Mutex = new Mutex(false, Application.ProductName + "-SingleInstanceMutex"); private static readonly Mutex _Mutex = new Mutex(false, Application.ProductName + "-SingleInstanceMutex");
+13 -2
View File
@@ -115,7 +115,7 @@ namespace Vocaluxe.Screens
if (_Buttons[_ButtonPrevious].Selected) if (_Buttons[_ButtonPrevious].Selected)
CBackgroundMusic.Previous(); CBackgroundMusic.Previous();
if (_Buttons[_ButtonPlay].Selected) if (_Buttons[_ButtonPlay].Selected)
CBackgroundMusic.Play(); CBackgroundMusic.Pause();
if (_Buttons[_ButtonPause].Selected) if (_Buttons[_ButtonPause].Selected)
CBackgroundMusic.Pause(); CBackgroundMusic.Pause();
if (_Buttons[_ButtonRepeat].Selected) if (_Buttons[_ButtonRepeat].Selected)
@@ -143,7 +143,7 @@ namespace Vocaluxe.Screens
if (_Buttons[_ButtonPrevious].Selected) if (_Buttons[_ButtonPrevious].Selected)
CBackgroundMusic.Previous(); CBackgroundMusic.Previous();
if (_Buttons[_ButtonPlay].Selected) if (_Buttons[_ButtonPlay].Selected)
CBackgroundMusic.Play(); CBackgroundMusic.Pause();
if (_Buttons[_ButtonPause].Selected) if (_Buttons[_ButtonPause].Selected)
CBackgroundMusic.Pause(); CBackgroundMusic.Pause();
if (_Buttons[_ButtonRepeat].Selected) if (_Buttons[_ButtonRepeat].Selected)
@@ -168,6 +168,17 @@ namespace Vocaluxe.Screens
return true; return true;
} }
public override void OnShow()
{
base.OnShow();
_Buttons[_ButtonNext].Visible = !CBackgroundMusic.IsPlayingPreview;
_Buttons[_ButtonPause].Visible = !CBackgroundMusic.IsPlayingPreview;
_Buttons[_ButtonPlay].Visible = !CBackgroundMusic.IsPlayingPreview;
_Buttons[_ButtonPrevious].Visible = !CBackgroundMusic.IsPlayingPreview;
_Buttons[_ButtonRepeat].Visible = !CBackgroundMusic.IsPlayingPreview;
_Buttons[_ButtonSing].Visible = !CBackgroundMusic.IsPlayingPreview;
}
public override bool UpdateGame() public override bool UpdateGame()
{ {
_Statics[_StaticCover].Visible = !_VideoPreviewInt || !CBackgroundMusic.SongHasVideo; _Statics[_StaticCover].Visible = !_VideoPreviewInt || !CBackgroundMusic.SongHasVideo;
+14 -1
View File
@@ -15,6 +15,7 @@
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>. // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
#endregion #endregion
using System.Windows.Forms;
using Vocaluxe.Base; using Vocaluxe.Base;
using Vocaluxe.Base.Server; using Vocaluxe.Base.Server;
using VocaluxeLib; using VocaluxeLib;
@@ -75,7 +76,7 @@ namespace Vocaluxe.Screens
public override bool HandleMouse(SMouseEvent mouseEvent) public override bool HandleMouse(SMouseEvent mouseEvent)
{ {
if (mouseEvent.LB) if (mouseEvent.LB || mouseEvent.RB)
{ {
CGraphics.HidePopup(EPopupScreens.PopupServerQR); CGraphics.HidePopup(EPopupScreens.PopupServerQR);
return true; return true;
@@ -83,6 +84,18 @@ namespace Vocaluxe.Screens
return false; return false;
} }
public override bool HandleInput(SKeyEvent keyEvent)
{
switch (keyEvent.Key)
{
case Keys.Escape:
case Keys.Back:
CGraphics.HidePopup(EPopupScreens.PopupServerQR);
return true;
}
return base.HandleInput(keyEvent);
}
public override bool UpdateGame() public override bool UpdateGame()
{ {
return true; return true;
+1 -1
View File
@@ -284,7 +284,7 @@ namespace Vocaluxe.Screens
else else
{ {
_Pos += num; _Pos += num;
_Pos = _Pos.Clamp(0, _Scores[_Round].Count - 1); _Pos = _Pos.Clamp(0, _Scores[_Round].Count - 1, true);
} }
} }
+3
View File
@@ -152,6 +152,9 @@ namespace Vocaluxe.Screens
{ {
CBackgroundMusic.OwnSongsAvailable = true; CBackgroundMusic.OwnSongsAvailable = true;
if (CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON || CConfig.VideosToBackground == EOffOn.TR_CONFIG_ON)
CBackgroundMusic.VideoEnabled = true;
CBackgroundMusic.Play(); CBackgroundMusic.Play();
} }
+3 -3
View File
@@ -52,7 +52,7 @@ namespace Vocaluxe.Screens
public override void LoadTheme(string xmlPath) public override void LoadTheme(string xmlPath)
{ {
base.LoadTheme(xmlPath); base.LoadTheme(xmlPath);
_SelectSlides[_SelectSlideBackgroundMusic].SetValues<EOffOn>((int)CConfig.BackgroundMusic); _SelectSlides[_SelectSlideBackgroundMusic].SetValues<EBackgroundMusicOffOn>((int)CConfig.BackgroundMusic);
_SelectSlides[_SelectSlideBackgroundMusicVolume].AddValues(new string[] _SelectSlides[_SelectSlideBackgroundMusicVolume].AddValues(new string[]
{"0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"}); {"0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"});
_SelectSlides[_SelectSlideBackgroundMusicVolume].Selection = CConfig.BackgroundMusicVolume / 5; _SelectSlides[_SelectSlideBackgroundMusicVolume].Selection = CConfig.BackgroundMusicVolume / 5;
@@ -150,14 +150,14 @@ namespace Vocaluxe.Screens
{ {
CConfig.GameMusicVolume = _SelectSlides[_SelectSlideGameMusicVolume].Selection * 5; CConfig.GameMusicVolume = _SelectSlides[_SelectSlideGameMusicVolume].Selection * 5;
CConfig.PreviewMusicVolume = _SelectSlides[_SelectSlidePreviewMusicVolume].Selection * 5; CConfig.PreviewMusicVolume = _SelectSlides[_SelectSlidePreviewMusicVolume].Selection * 5;
CConfig.BackgroundMusic = (EOffOn)_SelectSlides[_SelectSlideBackgroundMusic].Selection; CConfig.BackgroundMusic = (EBackgroundMusicOffOn)_SelectSlides[_SelectSlideBackgroundMusic].Selection;
CConfig.BackgroundMusicSource = (EBackgroundMusicSource)_SelectSlides[_SelectSlideBackgroundMusicSource].Selection; CConfig.BackgroundMusicSource = (EBackgroundMusicSource)_SelectSlides[_SelectSlideBackgroundMusicSource].Selection;
CConfig.BackgroundMusicVolume = _SelectSlides[_SelectSlideBackgroundMusicVolume].Selection * 5; CConfig.BackgroundMusicVolume = _SelectSlides[_SelectSlideBackgroundMusicVolume].Selection * 5;
CConfig.SaveConfig(); CConfig.SaveConfig();
CBackgroundMusic.SetMusicSource(CConfig.BackgroundMusicSource); CBackgroundMusic.SetMusicSource(CConfig.BackgroundMusicSource);
CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume); CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);
if (CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON) if (CConfig.BackgroundMusic == EBackgroundMusicOffOn.TR_CONFIG_ON)
CBackgroundMusic.Play(); CBackgroundMusic.Play();
else else
CBackgroundMusic.Pause(); CBackgroundMusic.Pause();
+3 -8
View File
@@ -345,13 +345,8 @@ namespace Vocaluxe.Screens
private void _OnSaveSnapshot() private void _OnSaveSnapshot()
{ {
string filename = Path.Combine(CSettings.DataPath, CConfig.ProfileFolders[0], "snapshot"); string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CConfig.ProfileFolders[0]), "snapshot.png");
int i = 0; _Snapshot.Save(file, ImageFormat.Png);
while (File.Exists(filename + i + ".png"))
i++;
filename = filename + i + ".png";
_Snapshot.Save(filename, ImageFormat.Png);
_Snapshot = null; _Snapshot = null;
CDraw.RemoveTexture(ref _WebcamTexture); CDraw.RemoveTexture(ref _WebcamTexture);
@@ -361,7 +356,7 @@ namespace Vocaluxe.Screens
_Buttons[_ButtonTakeSnapshot].Visible = false; _Buttons[_ButtonTakeSnapshot].Visible = false;
_Buttons[_ButtonWebcam].Visible = CWebcam.IsDeviceAvailable(); _Buttons[_ButtonWebcam].Visible = CWebcam.IsDeviceAvailable();
int id = CProfiles.NewAvatar(filename); int id = CProfiles.NewAvatar(file);
CProfiles.SetAvatar(_SelectSlides[_SelectSlideProfiles].ValueIndex, id); CProfiles.SetAvatar(_SelectSlides[_SelectSlideProfiles].ValueIndex, id);
_LoadAvatars(false); _LoadAvatars(false);
} }
+2 -4
View File
@@ -123,6 +123,8 @@ namespace Vocaluxe.Screens
public override void OnShow() public override void OnShow()
{ {
CBackgroundMusic.Disabled = false;
base.OnShow(); base.OnShow();
//-1 --> Show average //-1 --> Show average
_Round = CGame.NumRounds > 1 ? -1 : 0; _Round = CGame.NumRounds > 1 ? -1 : 0;
@@ -396,12 +398,8 @@ namespace Vocaluxe.Screens
private void _ChangeRound(int num) private void _ChangeRound(int num)
{ {
if (_Points.NumRounds < 1)
return;
_Round += num; _Round += num;
_Round = _Round.Clamp(-1, _Points.NumRounds - 1); _Round = _Round.Clamp(-1, _Points.NumRounds - 1);
if (_Round >= _Points.NumRounds)
_Round = _Points.NumRounds - 1;
_UpdateRatings(); _UpdateRatings();
} }
+3 -3
View File
@@ -433,7 +433,6 @@ namespace Vocaluxe.Screens
_UpdateAvatars(); _UpdateAvatars();
_UpdateNames(); _UpdateNames();
CBackgroundMusic.Disabled = true;
_CloseSong(); _CloseSong();
CSound.SetGlobalVolume(CConfig.GameMusicVolume); CSound.SetGlobalVolume(CConfig.GameMusicVolume);
} }
@@ -441,6 +440,7 @@ namespace Vocaluxe.Screens
public override void OnShowFinish() public override void OnShowFinish()
{ {
base.OnShowFinish(); base.OnShowFinish();
CBackgroundMusic.Disabled = true;
CGame.Start(); CGame.Start();
_LoadNextSong(); _LoadNextSong();
@@ -537,8 +537,6 @@ namespace Vocaluxe.Screens
_CloseSong(); _CloseSong();
if (_Webcam) if (_Webcam)
CWebcam.Stop(); CWebcam.Stop();
CBackgroundMusic.Disabled = false;
CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);
} }
private void _CloseSong() private void _CloseSong()
@@ -569,6 +567,8 @@ namespace Vocaluxe.Screens
_Texts[_TextSongName].Text = String.Empty; _Texts[_TextSongName].Text = String.Empty;
_Texts[_TextDuetName1].Text = String.Empty; _Texts[_TextDuetName1].Text = String.Empty;
_Texts[_TextDuetName2].Text = String.Empty; _Texts[_TextDuetName2].Text = String.Empty;
_Texts[_TextMedleyCountdown].Visible = false;
_Texts[_TextMedleyCountdown].Text = String.Empty;
} }
private void _LoadNextSong() private void _LoadNextSong()
+150 -137
View File
@@ -23,6 +23,7 @@ using System.Windows.Forms;
using Vocaluxe.Base; using Vocaluxe.Base;
using VocaluxeLib; using VocaluxeLib;
using VocaluxeLib.Menu; using VocaluxeLib.Menu;
using VocaluxeLib.Menu.SongMenu;
using VocaluxeLib.PartyModes; using VocaluxeLib.PartyModes;
using VocaluxeLib.Songs; using VocaluxeLib.Songs;
@@ -70,15 +71,15 @@ namespace Vocaluxe.Screens
private const string _StaticSearchBar = "StaticSearchBar"; private const string _StaticSearchBar = "StaticSearchBar";
private const string _StaticOptionsBG = "StaticOptionsBG"; private const string _StaticOptionsBG = "StaticOptionsBG";
private const string _SongMenu = "SongMenu"; private const string _SongMenuName = "SongMenu";
private const string _Playlist = "Playlist"; private const string _PlaylistName = "Playlist";
private string _SearchText = String.Empty; private string _SearchText = String.Empty;
private bool _SearchActive; private bool _SearchActive;
private readonly List<string> _ButtonsJoker = new List<string>(); private readonly List<string> _ButtonsJoker = new List<string>();
private readonly List<string> _TextsPlayer = new List<string>(); private readonly List<string> _TextsPlayer = new List<string>();
private bool _SongOptionsActive; private ESongOptionsView _CurSongOptionsView;
private bool _PlaylistActive; private bool _PlaylistActive;
private readonly List<EGameMode> _AvailableGameModes; private readonly List<EGameMode> _AvailableGameModes;
private SScreenSongOptions _Sso; private SScreenSongOptions _Sso;
@@ -91,6 +92,9 @@ namespace Vocaluxe.Screens
private int _SelectedSongID; private int _SelectedSongID;
private int _SelectedCategoryIndex; private int _SelectedCategoryIndex;
private CSongMenu _SongMenu;
private CPlaylist _Playlist;
public CScreenSong() public CScreenSong()
{ {
_AvailableGameModes = new List<EGameMode>(); _AvailableGameModes = new List<EGameMode>();
@@ -133,19 +137,20 @@ namespace Vocaluxe.Screens
_ThemeTexts = tlist.ToArray(); _ThemeTexts = tlist.ToArray();
_ThemeButtons = blist.ToArray(); _ThemeButtons = blist.ToArray();
_ThemeSelectSlides = new string[] {_SelectSlideOptionsMode, _SelectSlideOptionsPlaylistAdd, _SelectSlideOptionsPlaylistOpen, _SelectSlideOptionsNumMedleySongs}; _ThemeSelectSlides = new string[] {_SelectSlideOptionsMode, _SelectSlideOptionsPlaylistAdd, _SelectSlideOptionsPlaylistOpen, _SelectSlideOptionsNumMedleySongs};
_ThemeSongMenus = new string[] {_SongMenu}; _ThemeSongMenus = new string[] {_SongMenuName};
_ThemePlaylists = new string[] {_Playlist}; _ThemePlaylists = new string[] {_PlaylistName};
} }
public override void LoadTheme(string xmlPath) public override void LoadTheme(string xmlPath)
{ {
base.LoadTheme(xmlPath); base.LoadTheme(xmlPath);
_SongMenu = _SongMenus[_SongMenuName];
_Playlist = _Playlists[_PlaylistName];
_ToggleSongOptions(ESongOptionsView.None); _ToggleSongOptions(ESongOptionsView.None);
_Playlists[_Playlist].Visible = false;
_DragAndDropCover = GetNewStatic(); _DragAndDropCover = GetNewStatic();
_Playlists[_Playlist].Init(); _Playlist.Init();
_Playlist.Visible = false;
_AvailableGameModes.Clear(); _AvailableGameModes.Clear();
} }
@@ -158,11 +163,11 @@ namespace Vocaluxe.Screens
if (_PlaylistActive) if (_PlaylistActive)
{ {
_Playlists[_Playlist].HandleInput(keyEvent); _Playlist.HandleInput(keyEvent);
return true; return true;
} }
if (!_SongOptionsActive) if (_CurSongOptionsView == ESongOptionsView.None)
{ {
if (keyEvent.KeyPressed && !Char.IsControl(keyEvent.Unicode) && keyEvent.Mod != EModifier.Ctrl) if (keyEvent.KeyPressed && !Char.IsControl(keyEvent.Unicode) && keyEvent.Mod != EModifier.Ctrl)
{ {
@@ -176,8 +181,8 @@ namespace Vocaluxe.Screens
} }
else else
{ {
_SongMenus[_SongMenu].HandleInput(ref keyEvent, _Sso); if (_SongMenu.HandleInput(ref keyEvent, _Sso))
_UpdatePartyModeOptions(); keyEvent.Handled = true;
if (keyEvent.Handled) if (keyEvent.Handled)
return true; return true;
@@ -210,32 +215,31 @@ namespace Vocaluxe.Screens
} }
} }
if (_Buttons[_ButtonStart].Selected) if (_Buttons[_ButtonStart].Selected)
_HandlePartySongSelection(_SongMenus[_SongMenu].GetSelectedSong()); _HandlePartySongSelection(_SongMenu.GetPreviewSongNr());
} }
if (CSongs.NumSongsVisible > 0 && !_Sso.Selection.PartyMode) if (CSongs.NumSongsVisible > 0 && !_Sso.Selection.PartyMode)
{ {
if (_SongMenus[_SongMenu].GetSelectedSong() != -1 && !_SongOptionsActive) if (_SongMenu.GetPreviewSongNr() != -1)
{
if (!_Sso.Selection.PartyMode)
_ToggleSongOptions(ESongOptionsView.Song); _ToggleSongOptions(ESongOptionsView.Song);
} }
}
break; break;
case Keys.Tab: case Keys.Tab:
if (_Playlists[_Playlist].Visible) if (_Playlist.Visible)
{ {
_PlaylistActive = !_PlaylistActive; _PlaylistActive = !_PlaylistActive;
_Playlists[_Playlist].Selected = _PlaylistActive; _Playlist.Selected = _PlaylistActive;
_SongMenus[_SongMenu].SetActive(!_PlaylistActive); _SongMenu.Active = !_PlaylistActive;
} }
break; break;
case Keys.Back: case Keys.Back:
if (_SearchActive && _SearchText != "") if (_SearchActive)
{
if (_SearchText != "")
_ApplyNewSearchFilter(_SearchText.Remove(_SearchText.Length - 1)); _ApplyNewSearchFilter(_SearchText.Remove(_SearchText.Length - 1));
}
if ((CSongs.Category < 0 || _Sso.Sorting.Tabs == EOffOn.TR_CONFIG_OFF) && !_Sso.Selection.PartyMode && !_SearchActive) else if ((!CSongs.IsInCategory || _Sso.Sorting.Tabs == EOffOn.TR_CONFIG_OFF) && !_Sso.Selection.PartyMode)
CGraphics.FadeTo(EScreens.ScreenMain); CGraphics.FadeTo(EScreens.ScreenMain);
break; break;
@@ -276,7 +280,12 @@ namespace Vocaluxe.Screens
case Keys.S: case Keys.S:
if (keyEvent.Mod == EModifier.Ctrl && CSongs.NumSongsVisible > 0 && !_Sso.Selection.PartyMode) if (keyEvent.Mod == EModifier.Ctrl && CSongs.NumSongsVisible > 0 && !_Sso.Selection.PartyMode)
_StartMedleySong(_SongMenus[_SongMenu].GetSelectedSong()); _StartMedleySong(_SongMenu.GetPreviewSongNr());
break;
case Keys.F:
if (keyEvent.Mod == EModifier.Ctrl)
_SearchActive = true;
break; break;
case Keys.D1: case Keys.D1:
@@ -322,7 +331,7 @@ namespace Vocaluxe.Screens
else if (_Buttons[_ButtonOptionsSing].Selected) else if (_Buttons[_ButtonOptionsSing].Selected)
{ {
_ToggleSongOptions(ESongOptionsView.None); _ToggleSongOptions(ESongOptionsView.None);
_StartSong(_SongMenus[_SongMenu].GetSelectedSong()); _StartSong(_SongMenu.GetPreviewSongNr());
} }
else if (_Buttons[_ButtonOptionsPlaylist].Selected) else if (_Buttons[_ButtonOptionsPlaylist].Selected)
{ {
@@ -332,9 +341,9 @@ namespace Vocaluxe.Screens
else if (_Buttons[_ButtonOptionsRandom].Selected) else if (_Buttons[_ButtonOptionsRandom].Selected)
{ {
if (CSongs.IsInCategory) if (CSongs.IsInCategory)
_SongMenus[_SongMenu].SetSelectedSong(CSongs.GetRandomSong()); _SongMenu.SetSelectedSong(CSongs.GetRandomSong());
else else
_SongMenus[_SongMenu].SetSelectedCategory(CSongs.GetRandomCategory()); _SongMenu.SetSelectedCategory(CSongs.GetRandomCategory());
} }
else if (_Buttons[_ButtonOptionsSingAll].Selected) else if (_Buttons[_ButtonOptionsSingAll].Selected)
_StartRandomAllSongs(); _StartRandomAllSongs();
@@ -397,31 +406,31 @@ namespace Vocaluxe.Screens
_OldMousePosX = mouseEvent.X; _OldMousePosX = mouseEvent.X;
_OldMousePosY = mouseEvent.Y; _OldMousePosY = mouseEvent.Y;
if (_Playlists[_Playlist].Visible && _Playlists[_Playlist].IsMouseOver(mouseEvent)) if (_Playlist.Visible && _Playlist.IsMouseOver(mouseEvent))
{ {
_PlaylistActive = true; _PlaylistActive = true;
_Playlists[_Playlist].Selected = _PlaylistActive; _Playlist.Selected = _PlaylistActive;
_SongMenus[_SongMenu].SetActive(!_PlaylistActive); _SongMenu.Active = !_PlaylistActive;
_ToggleSongOptions(ESongOptionsView.None); _ToggleSongOptions(ESongOptionsView.None);
} }
else if (CHelper.IsInBounds(_SongMenus[_SongMenu].Rect, mouseEvent.X, mouseEvent.Y)) else if (CHelper.IsInBounds(_SongMenu.Rect, mouseEvent.X, mouseEvent.Y))
{ {
_PlaylistActive = false; _PlaylistActive = false;
_Playlists[_Playlist].Selected = _PlaylistActive; _Playlist.Selected = _PlaylistActive;
_SongMenus[_SongMenu].SetActive(!_PlaylistActive); _SongMenu.Active = !_PlaylistActive;
} }
if (_Playlists[_Playlist].Visible && _PlaylistActive) if (_Playlist.Visible && _PlaylistActive)
{ {
if (_Playlists[_Playlist].HandleMouse(mouseEvent)) if (_Playlist.HandleMouse(mouseEvent))
return true; return true;
} }
if (mouseEvent.RB) if (mouseEvent.RB)
{ {
if (_SongOptionsActive) if (_CurSongOptionsView != ESongOptionsView.None)
{ {
_ToggleSongOptions(ESongOptionsView.None); _ToggleSongOptions(ESongOptionsView.None);
return true; return true;
@@ -447,19 +456,23 @@ namespace Vocaluxe.Screens
if (mouseEvent.LD && !_Sso.Selection.PartyMode) if (mouseEvent.LD && !_Sso.Selection.PartyMode)
{ {
if (CSongs.NumSongsVisible > 0 && _SongMenus[_SongMenu].GetActualSelection() != -1 && _SongMenus[_SongMenu].IsMouseOverActualSelection(mouseEvent)) if (CSongs.NumSongsVisible > 0 && _SongMenu.GetPreviewSongNr() != -1 && _SongMenu.IsMouseOverSelectedSong(mouseEvent))
{ {
_ToggleSongOptions(ESongOptionsView.None); _ToggleSongOptions(ESongOptionsView.None);
_StartVisibleSong(_SongMenus[_SongMenu].GetActualSelection()); _StartVisibleSong(_SongMenu.GetPreviewSongNr());
return true; return true;
} }
} }
_SongMenus[_SongMenu].HandleMouse(ref mouseEvent, _Sso); if (_SongMenu.HandleMouse(ref mouseEvent, _Sso))
_UpdatePartyModeOptions(); mouseEvent.Handled = true;
if (mouseEvent.Handled) if (mouseEvent.Handled)
{
if (_CurSongOptionsView != ESongOptionsView.None)
_ToggleSongOptions(ESongOptionsView.None);
return true; return true;
}
if (mouseEvent.LB) if (mouseEvent.LB)
{ {
@@ -478,7 +491,7 @@ namespace Vocaluxe.Screens
if (_Buttons[_ButtonOptionsSing].Selected) if (_Buttons[_ButtonOptionsSing].Selected)
{ {
_ToggleSongOptions(ESongOptionsView.None); _ToggleSongOptions(ESongOptionsView.None);
_StartSong(_SongMenus[_SongMenu].GetSelectedSong()); _StartSong(_SongMenu.GetPreviewSongNr());
return true; return true;
} }
if (_Buttons[_ButtonOptionsPlaylist].Selected) if (_Buttons[_ButtonOptionsPlaylist].Selected)
@@ -491,7 +504,7 @@ namespace Vocaluxe.Screens
{ {
if (CSongs.IsInCategory) if (CSongs.IsInCategory)
{ {
_SongMenus[_SongMenu].SetSelectedSong(CSongs.GetRandomSong()); _SongMenu.SetSelectedSong(CSongs.GetRandomSong());
return true; return true;
} }
} }
@@ -499,7 +512,7 @@ namespace Vocaluxe.Screens
{ {
if (!CSongs.IsInCategory) if (!CSongs.IsInCategory)
{ {
_SongMenus[_SongMenu].SetSelectedCategory(CSongs.GetRandomCategory()); _SongMenu.SetSelectedCategory(CSongs.GetRandomCategory());
return true; return true;
} }
} }
@@ -545,7 +558,7 @@ namespace Vocaluxe.Screens
{ {
if (_Buttons[_ButtonStart].Selected) if (_Buttons[_ButtonStart].Selected)
{ {
_HandlePartySongSelection(_SongMenus[_SongMenu].GetSelectedSong()); _HandlePartySongSelection(_SongMenu.GetPreviewSongNr());
return true; return true;
} }
@@ -563,25 +576,20 @@ namespace Vocaluxe.Screens
} }
} }
if (CSongs.NumSongsVisible > 0 && _SongMenus[_SongMenu].GetActualSelection() != -1 && !_Sso.Selection.PartyMode) if (_SongMenu.GetPreviewSongNr() != -1 && !_Sso.Selection.PartyMode && _SongMenu.IsMouseOverSelectedSong(mouseEvent))
{
if (_SongMenus[_SongMenu].GetSelectedSong() != -1 && !_SongOptionsActive)
{ {
_ToggleSongOptions(ESongOptionsView.Song); _ToggleSongOptions(ESongOptionsView.Song);
return true; return true;
} }
_ToggleSongOptions(ESongOptionsView.None);
return true;
}
} }
if (mouseEvent.LBH) if (mouseEvent.LBH)
{ {
if (!_DragAndDropActive && _Playlists[_Playlist].Visible && CSongs.NumSongsVisible > 0 && _SongMenus[_SongMenu].GetActualSelection() != -1) if (!_DragAndDropActive && _Playlist.Visible && CSongs.NumSongsVisible > 0 && _SongMenu.GetSelectedSongNr() != -1)
{ {
_DragAndDropCover = _SongMenus[_SongMenu].GetSelectedSongCover(); _DragAndDropCover = _SongMenu.GetSelectedSongCover();
_DragAndDropCover.Rect.Z = CSettings.ZNear; _DragAndDropCover.Rect.Z = CSettings.ZNear;
_Playlists[_Playlist].DragAndDropSongID = CSongs.VisibleSongs[_SongMenus[_SongMenu].GetActualSelection()].ID; _Playlist.DragAndDropSongID = CSongs.VisibleSongs[_SongMenu.GetSelectedSongNr()].ID;
_DragAndDropActive = true; _DragAndDropActive = true;
return true; return true;
} }
@@ -591,7 +599,7 @@ namespace Vocaluxe.Screens
if (!mouseEvent.LBH && _DragAndDropActive) if (!mouseEvent.LBH && _DragAndDropActive)
{ {
_DragAndDropActive = false; _DragAndDropActive = false;
_Playlists[_Playlist].DragAndDropSongID = -1; _Playlist.DragAndDropSongID = -1;
return true; return true;
} }
@@ -608,7 +616,7 @@ namespace Vocaluxe.Screens
else if (_Sso.Selection.CategoryChangeAllowed) else if (_Sso.Selection.CategoryChangeAllowed)
{ {
_ToggleSongOptions(ESongOptionsView.None); _ToggleSongOptions(ESongOptionsView.None);
_SongMenus[_SongMenu].EnterCurrentCategory(); _SongMenu.EnterSelectedCategory();
} }
} }
@@ -625,7 +633,7 @@ namespace Vocaluxe.Screens
_SearchText = _Sso.Sorting.SearchString; _SearchText = _Sso.Sorting.SearchString;
CGame.Reset(); CGame.Reset();
_SongMenus[_SongMenu].OnShow(); _SongMenu.OnShow();
if (_Sso.Selection.PartyMode) if (_Sso.Selection.PartyMode)
_PlaylistActive = false; _PlaylistActive = false;
@@ -633,14 +641,14 @@ namespace Vocaluxe.Screens
if (_Sso.Selection.PartyMode) if (_Sso.Selection.PartyMode)
_ToggleSongOptions(ESongOptionsView.None); _ToggleSongOptions(ESongOptionsView.None);
_SongMenus[_SongMenu].SetActive(!_PlaylistActive); _SongMenu.Active = !_PlaylistActive;
_SongMenus[_SongMenu].SetSmallView(_Playlists[_Playlist].Visible); _SongMenu.SmallView = _Playlist.Visible;
if (_Playlists[_Playlist].ActivePlaylistID != -1) if (_Playlist.ActivePlaylistID != -1)
_Playlists[_Playlist].LoadPlaylist(_Playlists[_Playlist].ActivePlaylistID); _Playlist.LoadPlaylist(_Playlist.ActivePlaylistID);
_DragAndDropActive = false; _DragAndDropActive = false;
_Playlists[_Playlist].DragAndDropSongID = -1; _Playlist.DragAndDropSongID = -1;
UpdateGame(); UpdateGame();
if (CSongs.IsInCategory) if (CSongs.IsInCategory)
@@ -649,23 +657,25 @@ namespace Vocaluxe.Screens
public override bool UpdateGame() public override bool UpdateGame()
{ {
if (_SongMenus[_SongMenu].IsSmallView()) if (_PlaylistActive)
CheckPlaylist(); _CheckPlaylist();
_Texts[_TextCategory].Text = CSongs.GetCurrentCategoryName(); _Texts[_TextCategory].Text = CSongs.GetCurrentCategoryName();
if (CSongs.Category > -1 || CConfig.Tabs == EOffOn.TR_CONFIG_OFF) string selectionText = "";
CBackgroundMusic.Disabled = true; if (CSongs.IsInCategory)
{
int song = _SongMenu.GetSelectedSongNr();
if (song >= 0 && song < CSongs.VisibleSongs.Count)
selectionText = CSongs.VisibleSongs[song].Artist + " - " + CSongs.VisibleSongs[song].Title;
}
else else
CBackgroundMusic.Disabled = false; {
int cat = _SongMenu.GetSelectedCategory();
int song = _SongMenus[_SongMenu].GetActualSelection(); if (!CSongs.IsInCategory && cat >= 0 && cat < CSongs.Categories.Count)
if ((CSongs.IsInCategory || CConfig.Tabs == EOffOn.TR_CONFIG_OFF) && song >= 0 && song < CSongs.VisibleSongs.Count) _Texts[_TextSelection].Text = CSongs.Categories[cat].Name;
_Texts[_TextSelection].Text = CSongs.VisibleSongs[song].Artist + " - " + CSongs.VisibleSongs[song].Title; }
else if (!CSongs.IsInCategory && song >= 0 && song < CSongs.Categories.Count) _Texts[_TextSelection].Text = selectionText;
_Texts[_TextSelection].Text = CSongs.Categories[song].Name;
else
_Texts[_TextSelection].Text = String.Empty;
_Texts[_TextSearchBar].Text = _SearchText; _Texts[_TextSearchBar].Text = _SearchText;
if (_SearchActive) if (_SearchActive)
@@ -701,14 +711,19 @@ namespace Vocaluxe.Screens
public override void OnClose() public override void OnClose()
{ {
base.OnClose(); base.OnClose();
_SongMenu.OnHide();
if (CGraphics.NextScreen != EScreens.ScreenNames)
{
CBackgroundMusic.Disabled = false; CBackgroundMusic.Disabled = false;
CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume); CSound.SetGlobalVolume(CConfig.BackgroundMusicVolume);
_SongMenus[_SongMenu].OnHide(); }
} }
private void _HandlePartySongSelection(int songNr) private void _HandlePartySongSelection(int songNr)
{ {
if ((CSongs.Category >= 0) && (songNr >= 0)) if (CSongs.IsInCategory && (songNr >= 0))
{ {
CSong song = CSongs.VisibleSongs[songNr]; CSong song = CSongs.VisibleSongs[songNr];
if (song != null) if (song != null)
@@ -730,12 +745,12 @@ namespace Vocaluxe.Screens
_SelectNextRandomSong(); _SelectNextRandomSong();
if (_Sso.Selection.SongIndex != -1) if (_Sso.Selection.SongIndex != -1)
_SongMenus[_SongMenu].SetSelectedSong(_Sso.Selection.SongIndex); _SongMenu.SetSelectedSong(_Sso.Selection.SongIndex);
} }
if (_SelectedSongID != _SongMenus[_SongMenu].GetSelectedSong() && CSongs.Category > -1) if (_SelectedSongID != _SongMenu.GetPreviewSongNr() && CSongs.IsInCategory)
{ {
_SelectedSongID = _SongMenus[_SongMenu].GetSelectedSong(); _SelectedSongID = _SongMenu.GetPreviewSongNr();
CParty.OnSongChange(_SelectedSongID, ref _Sso); CParty.OnSongChange(_SelectedSongID, ref _Sso);
} }
@@ -752,14 +767,13 @@ namespace Vocaluxe.Screens
_ToggleSongOptions(ESongOptionsView.None); _ToggleSongOptions(ESongOptionsView.None);
} }
_SongMenus[_SongMenu].Update(_Sso); _SongMenu.Update(_Sso);
if (_Sso.Selection.RandomOnly && _Sso.Selection.NumJokers != null) if (_Sso.Selection.RandomOnly && _Sso.Selection.NumJokers != null)
{ {
_Buttons[_ButtonStart].Visible = true; _Buttons[_ButtonStart].Visible = true;
if (!_SongMenus[_SongMenu].IsSmallView()) _SongMenu.SmallView = true;
_SongMenus[_SongMenu].SetSmallView(true);
for (int i = 0; i < CSettings.MaxNumPlayer; i++) for (int i = 0; i < CSettings.MaxNumPlayer; i++)
{ {
@@ -791,8 +805,8 @@ namespace Vocaluxe.Screens
} }
else else
{ {
if (_Sso.Selection.PartyMode && _SongMenus[_SongMenu].IsSmallView()) if (_Sso.Selection.PartyMode)
_SongMenus[_SongMenu].SetSmallView(false); _SongMenu.SmallView = false;
for (int i = 0; i < CSettings.MaxNumPlayer; i++) for (int i = 0; i < CSettings.MaxNumPlayer; i++)
{ {
@@ -806,7 +820,7 @@ namespace Vocaluxe.Screens
private void _StartSong(int songNr) private void _StartSong(int songNr)
{ {
if ((CSongs.Category >= 0) && (songNr >= 0)) if (CSongs.IsInCategory && (songNr >= 0))
{ {
EGameMode gm; EGameMode gm;
if (_AvailableGameModes.Count >= _SelectSlides[_SelectSlideOptionsMode].Selection) if (_AvailableGameModes.Count >= _SelectSlides[_SelectSlideOptionsMode].Selection)
@@ -824,7 +838,7 @@ namespace Vocaluxe.Screens
private void _StartVisibleSong(int songNr) private void _StartVisibleSong(int songNr)
{ {
if (CSongs.Category >= 0 && songNr >= 0 && CSongs.NumSongsVisible > songNr) if (CSongs.IsInCategory && songNr >= 0 && CSongs.NumSongsVisible > songNr)
{ {
EGameMode gm = CSongs.VisibleSongs[songNr].IsDuet ? EGameMode.TR_GAMEMODE_DUET : EGameMode.TR_GAMEMODE_NORMAL; EGameMode gm = CSongs.VisibleSongs[songNr].IsDuet ? EGameMode.TR_GAMEMODE_DUET : EGameMode.TR_GAMEMODE_NORMAL;
@@ -838,7 +852,7 @@ namespace Vocaluxe.Screens
private void _StartMedleySong(int songNr) private void _StartMedleySong(int songNr)
{ {
if ((CSongs.Category >= 0) && (songNr >= 0)) if (CSongs.IsInCategory && (songNr >= 0))
{ {
if (!CSongs.VisibleSongs[songNr].IsGameModeAvailable(EGameMode.TR_GAMEMODE_MEDLEY)) if (!CSongs.VisibleSongs[songNr].IsGameModeAvailable(EGameMode.TR_GAMEMODE_MEDLEY))
return; return;
@@ -964,7 +978,7 @@ namespace Vocaluxe.Screens
if (CSongs.IsInCategory) if (CSongs.IsInCategory)
{ {
_ToggleSongOptions(ESongOptionsView.None); _ToggleSongOptions(ESongOptionsView.None);
_SongMenus[_SongMenu].SetSelectedSong(CSongs.GetRandomSong()); _SongMenu.SetSelectedSong(CSongs.GetRandomSong());
return true; return true;
} }
return false; return false;
@@ -975,7 +989,7 @@ namespace Vocaluxe.Screens
if (!CSongs.IsInCategory) if (!CSongs.IsInCategory)
{ {
_ToggleSongOptions(ESongOptionsView.None); _ToggleSongOptions(ESongOptionsView.None);
_SongMenus[_SongMenu].SetSelectedCategory(CSongs.GetRandomCategory()); _SongMenu.SetSelectedCategory(CSongs.GetRandomCategory());
return true; return true;
} }
return false; return false;
@@ -999,7 +1013,7 @@ namespace Vocaluxe.Screens
private void _JumpTo(char letter) private void _JumpTo(char letter)
{ {
int start = 0; int start = 0;
int curSelected = _SongMenus[_SongMenu].GetActualSelection(); int curSelected = CSongs.IsInCategory ? _SongMenu.GetSelectedSongNr() : _SongMenu.GetSelectedCategory();
bool firstLevel = CConfig.Tabs == EOffOn.TR_CONFIG_OFF && CSongs.IsInCategory; bool firstLevel = CConfig.Tabs == EOffOn.TR_CONFIG_OFF && CSongs.IsInCategory;
bool secondSort = CConfig.Tabs == EOffOn.TR_CONFIG_ON && bool secondSort = CConfig.Tabs == EOffOn.TR_CONFIG_ON &&
(CConfig.SongSorting == ESongSorting.TR_CONFIG_ARTIST || (CConfig.SongSorting == ESongSorting.TR_CONFIG_ARTIST ||
@@ -1042,7 +1056,7 @@ namespace Vocaluxe.Screens
break; break;
} }
if (visibleID > -1) if (visibleID > -1)
_SongMenus[_SongMenu].SetSelectedSong(visibleID); _SongMenu.SetSelectedSong(visibleID);
} }
else if (secondSort && CSongs.IsInCategory) else if (secondSort && CSongs.IsInCategory)
{ {
@@ -1066,7 +1080,7 @@ namespace Vocaluxe.Screens
break; break;
} }
if (visibleID > -1) if (visibleID > -1)
_SongMenus[_SongMenu].SetSelectedSong(visibleID); _SongMenu.SetSelectedSong(visibleID);
} }
else if (!CSongs.IsInCategory) else if (!CSongs.IsInCategory)
{ {
@@ -1076,7 +1090,7 @@ namespace Vocaluxe.Screens
start = curSelected + 1; start = curSelected + 1;
int visibleID = _FindIndex(categories, start, element => element.Name.StartsWith(letter.ToString(), StringComparison.OrdinalIgnoreCase)); int visibleID = _FindIndex(categories, start, element => element.Name.StartsWith(letter.ToString(), StringComparison.OrdinalIgnoreCase));
if (visibleID > -1) if (visibleID > -1)
_SongMenus[_SongMenu].SetSelectedCategory(visibleID); _SongMenu.SetSelectedCategory(visibleID);
} }
} }
@@ -1088,9 +1102,9 @@ namespace Vocaluxe.Screens
bool refresh = false; bool refresh = false;
_SearchText = newFilterString; _SearchText = newFilterString;
int songIndex = _SongMenus[_SongMenu].GetSelectedSong(); int songIndex = _SongMenu.GetSelectedSongNr();
int songID = -1; int songID = -1;
if (songIndex != -1 && CSongs.NumSongsVisible > 0 && CSongs.NumSongsVisible > songIndex) if (songIndex != -1)
songID = CSongs.VisibleSongs[songIndex].ID; songID = CSongs.VisibleSongs[songIndex].ID;
if (newFilterString == "" && _Sso.Sorting.Tabs == EOffOn.TR_CONFIG_ON) if (newFilterString == "" && _Sso.Sorting.Tabs == EOffOn.TR_CONFIG_ON)
@@ -1107,13 +1121,13 @@ namespace Vocaluxe.Screens
CSongs.Sort(_Sso.Sorting.SongSorting, _Sso.Sorting.Tabs, _Sso.Sorting.IgnoreArticles, newFilterString, _Sso.Sorting.DuetOptions); CSongs.Sort(_Sso.Sorting.SongSorting, _Sso.Sorting.Tabs, _Sso.Sorting.IgnoreArticles, newFilterString, _Sso.Sorting.DuetOptions);
if (songID == -1 || CSongs.NumSongsVisible == 0 || CSongs.NumSongsVisible <= songIndex || CSongs.GetVisibleSongByIndex(songIndex).ID != songID) if (songID == -1 || CSongs.NumSongsVisible <= songIndex || CSongs.GetVisibleSongByIndex(songIndex).ID != songID)
refresh = true; refresh = true;
if (refresh) if (refresh)
_SongMenus[_SongMenu].OnHide(); _SongMenu.OnHide();
_SongMenus[_SongMenu].OnShow(); _SongMenu.OnShow();
} }
private void _ToggleSongOptions(ESongOptionsView view) private void _ToggleSongOptions(ESongOptionsView view)
@@ -1137,13 +1151,13 @@ namespace Vocaluxe.Screens
_Buttons[_ButtonOpenOptions].Visible = true; _Buttons[_ButtonOpenOptions].Visible = true;
if (view == ESongOptionsView.None) if (view == ESongOptionsView.None)
_SongOptionsActive = false; _CurSongOptionsView = view;
else if (CSongs.IsInCategory) else if (CSongs.IsInCategory)
_SongOptionsActive = CSongs.VisibleSongs.Count > 0; _CurSongOptionsView = CSongs.VisibleSongs.Count > 0 ? view : ESongOptionsView.None;
else else
_SongOptionsActive = CSongs.Categories.Count > 0; _CurSongOptionsView = CSongs.Categories.Count > 0 ? view : ESongOptionsView.None;
if (!_SongOptionsActive) if (_CurSongOptionsView == ESongOptionsView.None)
return; return;
//Has to be done here otherwhise changed playlist names will not appear until OnShow is called! //Has to be done here otherwhise changed playlist names will not appear until OnShow is called!
@@ -1163,7 +1177,7 @@ namespace Vocaluxe.Screens
private void _CheckAndAddGameMode(EGameMode gameMode) private void _CheckAndAddGameMode(EGameMode gameMode)
{ {
if (CSongs.VisibleSongs[_SongMenus[_SongMenu].GetSelectedSong()].IsGameModeAvailable(gameMode)) if (CSongs.VisibleSongs[_SongMenu.GetPreviewSongNr()].IsGameModeAvailable(gameMode))
{ {
_SelectSlides[_SelectSlideOptionsMode].AddValue(Enum.GetName(typeof(EGameMode), gameMode)); _SelectSlides[_SelectSlideOptionsMode].AddValue(Enum.GetName(typeof(EGameMode), gameMode));
_AvailableGameModes.Add(gameMode); _AvailableGameModes.Add(gameMode);
@@ -1243,31 +1257,30 @@ namespace Vocaluxe.Screens
} }
#region Playlist Actions #region Playlist Actions
public void CheckPlaylist() private void _CheckPlaylist()
{ {
if (_Playlists[_Playlist].ActivePlaylistID == -1 && _PlaylistActive) if (_Playlist.ActivePlaylistID == -1 && _PlaylistActive)
_ClosePlaylist(); _ClosePlaylist();
} }
private void _OpenPlaylist(int playlistID) private void _OpenPlaylist(int playlistID)
{ {
if (CPlaylists.Playlists.Length > playlistID && playlistID >= 0) if (_Playlist.LoadPlaylist(playlistID))
{ {
_Playlists[_Playlist].LoadPlaylist(playlistID); _SongMenu.SmallView = true;
_SongMenus[_SongMenu].SetSmallView(true); _Playlist.Visible = true;
_Playlists[_Playlist].Visible = true;
} }
} }
private void _ClosePlaylist() private void _ClosePlaylist()
{ {
if (_Playlists[_Playlist].Visible || _PlaylistActive) if (_Playlist.Visible || _PlaylistActive)
{ {
_SongMenus[_SongMenu].SetSmallView(false); _SongMenu.SmallView = false;
_PlaylistActive = false; _PlaylistActive = false;
_Playlists[_Playlist].Selected = _PlaylistActive; _Playlist.Selected = _PlaylistActive;
_SongMenus[_SongMenu].SetActive(!_PlaylistActive); _SongMenu.Active = !_PlaylistActive;
_Playlists[_Playlist].ClosePlaylist(); _Playlist.ClosePlaylist();
} }
} }
@@ -1275,22 +1288,22 @@ namespace Vocaluxe.Screens
{ {
_SelectSlides[_SelectSlideOptionsPlaylistAdd].Clear(); _SelectSlides[_SelectSlideOptionsPlaylistAdd].Clear();
_SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValue("TR_SCREENSONG_NEWPLAYLIST"); _SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValue("TR_SCREENSONG_NEWPLAYLIST");
_SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValues(CPlaylists.PlaylistNames); _SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValues(CPlaylists.Names);
_SelectSlides[_SelectSlideOptionsPlaylistOpen].Clear(); _SelectSlides[_SelectSlideOptionsPlaylistOpen].Clear();
_SelectSlides[_SelectSlideOptionsPlaylistOpen].AddValues(CPlaylists.PlaylistNames); _SelectSlides[_SelectSlideOptionsPlaylistOpen].AddValues(CPlaylists.Names);
} }
private void _OpenAndAddPlaylistAction() private void _OpenAndAddPlaylistAction()
{ {
//Open an existing playlist and add song if (_Playlist.ActivePlaylistID != (_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1) &&
if (_Playlists[_Playlist].ActivePlaylistID != (_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1) &&
(_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1) != -1) (_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1) != -1)
{ {
//Open an existing playlist and add song
//Check selected game-mode //Check selected game-mode
EGameMode gm; EGameMode gm;
if (_AvailableGameModes.Count >= _SelectSlides[_SelectSlideOptionsMode].Selection) if (_AvailableGameModes.Count >= _SelectSlides[_SelectSlideOptionsMode].Selection)
gm = _AvailableGameModes[_SelectSlides[_SelectSlideOptionsMode].Selection]; gm = _AvailableGameModes[_SelectSlides[_SelectSlideOptionsMode].Selection];
else if (CSongs.VisibleSongs[_SongMenus[_SongMenu].GetSelectedSong()].IsDuet) else if (CSongs.VisibleSongs[_SongMenu.GetPreviewSongNr()].IsDuet)
gm = EGameMode.TR_GAMEMODE_DUET; gm = EGameMode.TR_GAMEMODE_DUET;
else else
gm = EGameMode.TR_GAMEMODE_NORMAL; gm = EGameMode.TR_GAMEMODE_NORMAL;
@@ -1298,63 +1311,63 @@ namespace Vocaluxe.Screens
//Check if Playlist really exists //Check if Playlist really exists
if (_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1 >= 0) if (_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1 >= 0)
{ {
_Playlists[_Playlist].ActivePlaylistID = _SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1; _Playlist.ActivePlaylistID = _SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1;
//Add song to playlist //Add song to playlist
CPlaylists.Playlists[_Playlists[_Playlist].ActivePlaylistID].AddSong(CSongs.VisibleSongs[_SongMenus[_SongMenu].GetSelectedSong()].ID, gm); CPlaylists.AddSong(_Playlist.ActivePlaylistID, CSongs.VisibleSongs[_SongMenu.GetPreviewSongNr()].ID, gm);
//Open playlist //Open playlist
_OpenPlaylist(_Playlists[_Playlist].ActivePlaylistID); _OpenPlaylist(_Playlist.ActivePlaylistID);
_Playlists[_Playlist].ScrollToBottom(); _Playlist.ScrollToBottom();
} }
} }
//Create a new playlist and add song
else if ((_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1) == -1) else if ((_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection - 1) == -1)
{ {
//Create a new playlist and add song
//Check selected game-mode //Check selected game-mode
EGameMode gm; EGameMode gm;
if (_AvailableGameModes.Count >= _SelectSlides[_SelectSlideOptionsMode].Selection) if (_AvailableGameModes.Count >= _SelectSlides[_SelectSlideOptionsMode].Selection)
gm = _AvailableGameModes[_SelectSlides[_SelectSlideOptionsMode].Selection]; gm = _AvailableGameModes[_SelectSlides[_SelectSlideOptionsMode].Selection];
else if (CSongs.VisibleSongs[_SongMenus[_SongMenu].GetSelectedSong()].IsDuet) else if (CSongs.VisibleSongs[_SongMenu.GetPreviewSongNr()].IsDuet)
gm = EGameMode.TR_GAMEMODE_DUET; gm = EGameMode.TR_GAMEMODE_DUET;
else else
gm = EGameMode.TR_GAMEMODE_NORMAL; gm = EGameMode.TR_GAMEMODE_NORMAL;
//Create new playlist //Create new playlist
_Playlists[_Playlist].ActivePlaylistID = CPlaylists.NewPlaylist(); _Playlist.ActivePlaylistID = CPlaylists.NewPlaylist();
//Add song to playlist //Add song to playlist
CPlaylists.Playlists[_Playlists[_Playlist].ActivePlaylistID].AddSong(CSongs.VisibleSongs[_SongMenus[_SongMenu].GetSelectedSong()].ID, gm); CPlaylists.AddSong(_Playlist.ActivePlaylistID, CSongs.VisibleSongs[_SongMenu.GetPreviewSongNr()].ID, gm);
//Open playlist //Open playlist
_OpenPlaylist(_Playlists[_Playlist].ActivePlaylistID); _OpenPlaylist(_Playlist.ActivePlaylistID);
//Add new playlist to select-slide //Add new playlist to select-slide
_SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValue(CPlaylists.Playlists[_Playlists[_Playlist].ActivePlaylistID].PlaylistName); _SelectSlides[_SelectSlideOptionsPlaylistAdd].AddValue(CPlaylists.GetName(_Playlist.ActivePlaylistID));
_SelectSlides[_SelectSlideOptionsPlaylistOpen].AddValue(CPlaylists.Playlists[_Playlists[_Playlist].ActivePlaylistID].PlaylistName); _SelectSlides[_SelectSlideOptionsPlaylistOpen].AddValue(CPlaylists.GetName(_Playlist.ActivePlaylistID));
} }
//Add song to loaded playlist
else else
{ {
//Add song to loaded playlist
//Check selected game-mode //Check selected game-mode
EGameMode gm; EGameMode gm;
if (_AvailableGameModes.Count >= _SelectSlides[_SelectSlideOptionsMode].Selection) if (_AvailableGameModes.Count >= _SelectSlides[_SelectSlideOptionsMode].Selection)
gm = _AvailableGameModes[_SelectSlides[_SelectSlideOptionsMode].Selection]; gm = _AvailableGameModes[_SelectSlides[_SelectSlideOptionsMode].Selection];
else if (CSongs.VisibleSongs[_SongMenus[_SongMenu].GetSelectedSong()].IsDuet) else if (CSongs.VisibleSongs[_SongMenu.GetPreviewSongNr()].IsDuet)
gm = EGameMode.TR_GAMEMODE_DUET; gm = EGameMode.TR_GAMEMODE_DUET;
else else
gm = EGameMode.TR_GAMEMODE_NORMAL; gm = EGameMode.TR_GAMEMODE_NORMAL;
CPlaylists.Playlists[_Playlists[_Playlist].ActivePlaylistID].AddSong(CSongs.VisibleSongs[_SongMenus[_SongMenu].GetSelectedSong()].ID, gm); CPlaylists.AddSong(_Playlist.ActivePlaylistID, CSongs.VisibleSongs[_SongMenu.GetPreviewSongNr()].ID, gm);
_Playlists[_Playlist].UpdatePlaylist(); _Playlist.UpdatePlaylist();
_Playlists[_Playlist].ScrollToBottom(); _Playlist.ScrollToBottom();
} }
} }
private void _SetSelectSlidePlaylistToCurrentPlaylist() private void _SetSelectSlidePlaylistToCurrentPlaylist()
{ {
if (_Playlists[_Playlist].ActivePlaylistID > -1) if (_Playlist.ActivePlaylistID > -1)
_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection = _Playlists[_Playlist].ActivePlaylistID + 1; _SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection = _Playlist.ActivePlaylistID + 1;
else else
_SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection = 0; _SelectSlides[_SelectSlideOptionsPlaylistAdd].Selection = 0;
} }
+5 -1
View File
@@ -41,6 +41,7 @@ namespace Vocaluxe.SongQueue
private List<SSongQueueEntry> _SongQueue; private List<SSongQueueEntry> _SongQueue;
private int _CurrentRound; private int _CurrentRound;
private CPoints _Points; private CPoints _Points;
private CSong _CurrentSong;
#region Implementation #region Implementation
public void Init() public void Init()
@@ -124,6 +125,7 @@ namespace Vocaluxe.SongQueue
_SongQueue[_CurrentRound].GameMode); _SongQueue[_CurrentRound].GameMode);
} }
_CurrentRound++; _CurrentRound++;
_CurrentSong = IsFinished() ? null : CGameModes.Get(GetCurrentGameMode()).GetSong(_SongQueue[_CurrentRound].SongID);
} }
public bool IsFinished() public bool IsFinished()
@@ -155,7 +157,7 @@ namespace Vocaluxe.SongQueue
/// <returns>Song of current round or null if there is none/game finished</returns> /// <returns>Song of current round or null if there is none/game finished</returns>
public CSong GetSong() public CSong GetSong()
{ {
return GetSong(_CurrentRound); return _CurrentSong;
} }
public int GetNumSongs() public int GetNumSongs()
@@ -170,6 +172,8 @@ namespace Vocaluxe.SongQueue
/// <returns>Current song or null if out of bounds</returns> /// <returns>Current song or null if out of bounds</returns>
public CSong GetSong(int round) public CSong GetSong(int round)
{ {
if (round == _CurrentRound)
return _CurrentSong;
if (round < _SongQueue.Count && round >= 0) if (round < _SongQueue.Count && round >= 0)
return CSongs.GetSong(_SongQueue[round].SongID); return CSongs.GetSong(_SongQueue[round].SongID);
+1
View File
@@ -218,6 +218,7 @@
<Compile Include="Base\CBackgroundMusic.cs" /> <Compile Include="Base\CBackgroundMusic.cs" />
<Compile Include="Base\CPlaylistElement.cs" /> <Compile Include="Base\CPlaylistElement.cs" />
<Compile Include="Base\CRecord.cs" /> <Compile Include="Base\CRecord.cs" />
<Compile Include="Base\CVideoPlayer.cs" />
<Compile Include="COSFunctions.cs" /> <Compile Include="COSFunctions.cs" />
<Compile Include="Lib\Database\CCoverDB.cs" /> <Compile Include="Lib\Database\CCoverDB.cs" />
<Compile Include="Lib\Database\CDatabaseBase.cs" /> <Compile Include="Lib\Database\CDatabaseBase.cs" />
+60 -22
View File
@@ -17,6 +17,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
@@ -63,8 +64,18 @@ namespace VocaluxeLib
return (int)result; return (int)result;
} }
/// <summary>
/// Makes sure val is between min and max
/// Asserts that min&lt;=max
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="val"></param>
/// <param name="min"></param>
/// <param name="max"></param>
/// <returns>Clamped value</returns>
public static T Clamp<T>(this T val, T min, T max) where T : IComparable<T> public static T Clamp<T>(this T val, T min, T max) where T : IComparable<T>
{ {
Debug.Assert(min.CompareTo(max) <= 0);
if (val.CompareTo(min) < 0) if (val.CompareTo(min) < 0)
return min; return min;
if (val.CompareTo(max) > 0) if (val.CompareTo(max) > 0)
@@ -72,6 +83,27 @@ namespace VocaluxeLib
return val; return val;
} }
/// <summary>
/// Makes sure val is between min and max but also handles the case where min&gt;max
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="val"></param>
/// <param name="min"></param>
/// <param name="max"></param>
/// <param name="preferMin"></param>
/// <returns>Clamped value</returns>
public static T Clamp<T>(this T val, T min, T max, bool preferMin) where T : IComparable<T>
{
if (min.CompareTo(max) > 0)
{
if (preferMin)
max = min;
else
min = max;
}
return Clamp(val, min, max);
}
/// <summary> /// <summary>
/// Concat strings into one string with ", " as separator. /// Concat strings into one string with ", " as separator.
/// </summary> /// </summary>
@@ -88,30 +120,13 @@ namespace VocaluxeLib
return result; return result;
} }
public static int TryReadInt(StreamReader sr) public static void SetRect(SRectF bounds, out SRectF rect, float rectAspect, EAspect aspect)
{ {
string value = String.Empty; var bounds2 = new RectangleF(bounds.X, bounds.Y, bounds.W, bounds.H);
RectangleF rect2;
SetRect(bounds2, out rect2, rectAspect, aspect);
try rect = new SRectF(rect2.X, rect2.Y, rect2.Width, rect2.Height, bounds.Z);
{
int tmp = sr.Peek();
//Check for ' ', ?, ?, \n, \r, E
while (tmp != 32 && tmp != 19 && tmp != 16 && tmp != 13 && tmp != 10 && tmp != 69)
{
if (sr.EndOfStream)
break;
var chr = (char)sr.Read();
value += chr.ToString();
tmp = sr.Peek();
}
}
catch (Exception)
{
return 0;
}
int result;
return Int32.TryParse(value, out result) ? result : 0;
} }
public static void SetRect(RectangleF bounds, out RectangleF rect, float rectAspect, EAspect aspect) public static void SetRect(RectangleF bounds, out RectangleF rect, float rectAspect, EAspect aspect)
@@ -264,6 +279,29 @@ namespace VocaluxeLib
{ {
return (bounds.X <= x) && (bounds.X + bounds.W >= x) && (bounds.Y <= y) && (bounds.Y + bounds.H >= y); return (bounds.X <= x) && (bounds.X + bounds.W >= x) && (bounds.Y <= y) && (bounds.Y + bounds.H >= y);
} }
/// <summary>
/// Returns a filename that is unique in that path
/// </summary>
/// <param name="path">Path in which the file should be stored</param>
/// <param name="filename">filename (including extension)</param>
/// <param name="withPath">Whether the fullpath or only the filename should be returned</param>
/// <returns></returns>
public static string GetUniqueFileName(string path, string filename, bool withPath = true)
{
string ext = Path.GetExtension(filename);
filename = Path.GetFileNameWithoutExtension(filename) ?? "1";
if (File.Exists(Path.Combine(path, filename + ext)))
{
int i = 1;
while (File.Exists(Path.Combine(path, filename + "_" + i + ext)))
i++;
filename += "_" + i;
}
if (withPath)
filename = Path.Combine(path, filename);
return filename + ext;
}
} }
static class CEncoding static class CEncoding
+44 -84
View File
@@ -57,52 +57,44 @@ namespace VocaluxeLib
} }
} }
public bool TryGetEnumValue<T>(string cast, ref T value) public bool TryGetEnumValue<T>(string xPath, ref T value)
where T : struct where T : struct
{ {
string val; string val;
if (GetValue(cast, out val, Enum.GetName(typeof(T), value))) if (GetValue(xPath, out val, Enum.GetName(typeof(T), value)))
{ return CHelper.TryParse(val, out value, true);
CHelper.TryParse(val, out value, true);
return true;
}
return false; return false;
} }
public bool TryGetIntValue(string cast, ref int value) public bool TryGetIntValue(string xPath, ref int value)
{ {
string val; string val;
if (GetValue(cast, out val, value.ToString())) if (GetValue(xPath, out val, value.ToString()))
return int.TryParse(val, out value); return int.TryParse(val, out value);
return false; return false;
} }
public bool TryGetIntValueRange(string cast, ref int value, int min = 0, int max = 100) public bool TryGetIntValueRange(string xPath, ref int value, int min = 0, int max = 100)
{ {
bool result = TryGetIntValue(cast, ref value); bool result = TryGetIntValue(xPath, ref value);
if (result) if (result)
{ value = value.Clamp(min, max);
if (value < min)
value = min;
else if (value > max)
value = max;
}
return result; return result;
} }
public bool TryGetFloatValue(string cast, ref float value) public bool TryGetFloatValue(string xPath, ref float value)
{ {
string val; string val;
return GetValue(cast, out val, value.ToString()) && CHelper.TryParse(val, out value); return GetValue(xPath, out val, value.ToString()) && CHelper.TryParse(val, out value);
} }
public bool GetValue(string cast, out string value, string defaultValue) public bool GetValue(string xPath, out string value, string defaultValue)
{ {
int resultCt = 0; int resultCt = 0;
string val = string.Empty; string val = string.Empty;
_Navigator.MoveToFirstChild(); _Navigator.MoveToRoot();
XPathNodeIterator iterator = _Navigator.Select(cast); XPathNodeIterator iterator = _Navigator.Select(xPath);
while (iterator.MoveNext()) while (iterator.MoveNext())
{ {
@@ -119,77 +111,45 @@ namespace VocaluxeLib
return true; return true;
} }
public List<string> GetValues(string cast) public List<string> GetNames(string xPath)
{ {
var values = new List<string>(); var values = new List<string>();
_Navigator.MoveToRoot(); _Navigator.MoveToRoot();
_Navigator.MoveToFirstChild(); XPathNodeIterator iterator = _Navigator.Select(xPath);
_Navigator.MoveToFirstChild();
while (_Navigator.Name != cast)
_Navigator.MoveToNext();
_Navigator.MoveToFirstChild();
values.Add(_Navigator.LocalName);
while (_Navigator.MoveToNext())
values.Add(_Navigator.LocalName);
return values;
}
public IEnumerable<string> GetAttributes(string cast, string attribute)
{
var values = new List<string>();
_Navigator.MoveToRoot();
_Navigator.MoveToFirstChild();
while (_Navigator.Name != cast)
_Navigator.MoveToNext();
_Navigator.MoveToFirstChild();
values.Add(_Navigator.LocalName);
while (_Navigator.MoveToNext())
values.Add(_Navigator.GetAttribute(attribute, ""));
return values;
}
public bool GetInnerValues(string cast, ref List<string> values)
{
_Navigator.MoveToRoot();
_Navigator.MoveToFirstChild();
_Navigator.MoveToFirstChild();
while (_Navigator.Name != cast)
_Navigator.MoveToNext();
_Navigator.MoveToFirstChild();
values.Add(_Navigator.Value);
while (_Navigator.MoveToNext())
values.Add(_Navigator.Value);
return true;
}
public bool ItemExists(string cast)
{
int results = 0;
_Navigator.MoveToFirstChild();
XPathNodeIterator iterator = _Navigator.Select(cast);
while (iterator.MoveNext()) while (iterator.MoveNext())
results++; values.Add(iterator.Current.LocalName);
if (results == 0) return values;
return false; }
public IEnumerable<string> GetAttributes(string xPath, string attribute)
{
var values = new List<string>();
_Navigator.MoveToRoot();
XPathNodeIterator iterator = _Navigator.Select(xPath);
while (iterator.MoveNext())
values.Add(iterator.Current.GetAttribute(attribute, ""));
return values;
}
public bool GetValues(string xPath, ref List<string> values)
{
_Navigator.MoveToRoot();
XPathNodeIterator iterator = _Navigator.Select(xPath);
while (iterator.MoveNext())
values.Add(iterator.Current.Value);
return true; return true;
} }
public bool ItemExists(string xPath)
{
_Navigator.MoveToRoot();
return _Navigator.Select(xPath).MoveNext();
}
} }
} }
+15
View File
@@ -248,6 +248,13 @@ namespace VocaluxeLib
// ReSharper restore InconsistentNaming // ReSharper restore InconsistentNaming
} }
public enum EBackgroundMusicOffOn
{
TR_CONFIG_OFF,
TR_CONFIG_ONLY_SONG,
TR_CONFIG_ON
}
public enum EPlayerInfo public enum EPlayerInfo
{ {
// ReSharper disable InconsistentNaming // ReSharper disable InconsistentNaming
@@ -288,6 +295,14 @@ namespace VocaluxeLib
} }
#endregion Config #endregion Config
public enum EStreamAction
{
Nothing,
Pause,
Stop,
Close
}
public enum EProgramState public enum EProgramState
{ {
Start, Start,
+10
View File
@@ -124,5 +124,15 @@ namespace VocaluxeLib
{ {
return value.ToString("F", NumberFormatInfo.InvariantInfo); return value.ToString("F", NumberFormatInfo.InvariantInfo);
} }
public static SRectF Scale(this SRectF rect, float scale)
{
return new SRectF(
rect.X - rect.W * (scale - 1f),
rect.Y - rect.H * (scale - 1f),
rect.W + 2 * rect.W * (scale - 1f),
rect.H + 2 * rect.H * (scale - 1f),
rect.Z);
}
} }
} }
+49 -17
View File
@@ -35,6 +35,8 @@ namespace VocaluxeLib
void SetBackgroundMusicVolume(int newVolume); void SetBackgroundMusicVolume(int newVolume);
int GetBackgroundMusicVolume(); int GetBackgroundMusicVolume();
EBackgroundMusicOffOn GetBackgroundMusicStatus();
int GetPreviewMusicVolume(); int GetPreviewMusicVolume();
EOffOn GetVideosToBackground(); EOffOn GetVideosToBackground();
@@ -89,6 +91,8 @@ namespace VocaluxeLib
float GetSlideShowImageTime(); float GetSlideShowImageTime();
float GetSlideShowFadeTime(); float GetSlideShowFadeTime();
float GetSoundPlayerFadeTime();
} }
public interface ITheme public interface ITheme
@@ -115,16 +119,24 @@ namespace VocaluxeLib
{ {
bool IsDisabled(); bool IsDisabled();
bool IsPlaying(); bool IsPlaying();
bool IsPlayingPreview();
bool SongHasVideo(); bool SongHasVideo();
bool VideoEnabled(); bool VideoEnabled();
float GetLength();
void SetStatus(bool disabled); void SetDisabled(bool disabled);
void Next(); void Next();
void Previous(); void Previous();
void Pause(); void Pause();
void Play(); void Play();
void Stop();
CTexture GetVideoTexture(); CTexture GetVideoTexture();
void LoadPreview(CSong song, float start = 0f);
void PlayPreview(float start = -1f);
void StopPreview();
} }
public interface IDrawing public interface IDrawing
@@ -148,6 +160,8 @@ namespace VocaluxeLib
void FadeTo(EScreens nextScreen); void FadeTo(EScreens nextScreen);
float GetGlobalAlpha(); float GetGlobalAlpha();
EScreens GetNextScreen();
} }
public interface ILog public interface ILog
@@ -196,6 +210,8 @@ namespace VocaluxeLib
void Reset(); void Reset();
void ClearSongs(); void ClearSongs();
int GetNumSongs(); int GetNumSongs();
CSong GetSong();
CSong GetSong(int round);
} }
public interface IRecording public interface IRecording
@@ -253,6 +269,8 @@ namespace VocaluxeLib
bool IsFinished(int streamID); bool IsFinished(int streamID);
bool Close(int streamID); bool Close(int streamID);
void SetLoop(int streamID, bool loop = true); void SetLoop(int streamID, bool loop = true);
void Resume(int streamID);
void Pause(int streamID);
} }
public interface ISound public interface ISound
@@ -260,12 +278,12 @@ namespace VocaluxeLib
int Load(string soundFile, bool loop = false, bool prescan = false); int Load(string soundFile, bool loop = false, bool prescan = false);
void SetPosition(int soundStream, float newPosition); void SetPosition(int soundStream, float newPosition);
void Play(int soundStream); void Play(int soundStream);
void Fade(int soundStream, float targetVolume, float duration); void Fade(int soundStream, float targetVolume, float duration, EStreamAction afterFadeAction = EStreamAction.Nothing);
void Close(int soundStream);
bool IsFinished(int soundStream); bool IsFinished(int soundStream);
float GetPosition(int soundStream); float GetPosition(int soundStream);
float GetLength(int soundStream); float GetLength(int soundStream);
void FadeAndClose(int soundStream, float targetVolume, float duration);
void SetStreamVolume(int soundStream, float volume); void SetStreamVolume(int soundStream, float volume);
} }
@@ -288,24 +306,38 @@ namespace VocaluxeLib
public interface IPlaylist public interface IPlaylist
{ {
string GetPlaylistName(int playlistID); bool Exists(int playlistID);
List<string> GetPlaylistNames(); string GetName(int playlistID);
List<string> GetNames();
void SetPlaylistName(int playlistID, string name); void SetName(int playlistID, string name);
void DeletePlaylist(int playlistID); void Delete(int playlistID);
void SavePlaylist(int playlistID); void Save(int playlistID);
int GetNumPlaylists(); int GetNumPlaylists();
void AddPlaylistSong(int playlistID, int songID); void AddSong(int playlistID, int songID);
void AddPlaylistSong(int playlistID, int songID, EGameMode gameMode); void AddSong(int playlistID, int songID, EGameMode gameMode);
void InsertPlaylistSong(int playlistID, int positionIndex, int songID, EGameMode gameMode); void InsertSong(int playlistID, int positionIndex, int songID, EGameMode gameMode);
void MovePlaylistSong(int playlistID, int sourceIndex, int destIndex); void MoveSong(int playlistID, int sourceIndex, int destIndex);
void MovePlaylistSongDown(int playlistID, int songIndex); void MoveSongDown(int playlistID, int songIndex);
void MovePlaylistSongUp(int playlistID, int songIndex); void MoveSongUp(int playlistID, int songIndex);
void DeletePlaylistSong(int playlistID, int songIndex); void DeleteSong(int playlistID, int songIndex);
int GetSongCount(int playlistID);
CPlaylistSong GetSong(int playlistID, int songIndex);
}
public interface IPreviewPlayer
{
void Play(float start = -1);
void Load(CSong song, float start = 0f);
void Stop();
void TogglePause();
CTexture GetCover();
CTexture GetVideoTexture();
bool IsPlaying();
float GetLength();
int GetPlaylistSongCount(int playlistID);
CPlaylistSong GetPlaylistSong(int playlistID, int songIndex);
} }
} }
+1 -1
View File
@@ -194,7 +194,7 @@ namespace VocaluxeLib.Menu
if (!String.IsNullOrEmpty(_Theme.TextureName) && if (!String.IsNullOrEmpty(_Theme.TextureName) &&
(_Theme.Type == EBackgroundTypes.Texture || (_Theme.Type == EBackgroundTypes.Texture ||
(_Theme.Type == EBackgroundTypes.Video && (CBase.Config.GetVideoBackgrounds() == EOffOn.TR_CONFIG_OFF || !ok)))) (_Theme.Type == EBackgroundTypes.Video && CBase.Config.GetVideoBackgrounds() == EOffOn.TR_CONFIG_OFF)))
ok = _DrawTexture(); ok = _DrawTexture();
if (_Theme.Type == EBackgroundTypes.Color || _Theme.Type == EBackgroundTypes.Texture && !ok || if (_Theme.Type == EBackgroundTypes.Color || _Theme.Type == EBackgroundTypes.Texture && !ok ||
+1
View File
@@ -339,6 +339,7 @@ namespace VocaluxeLib.Menu
foreach (CNameSelection ns in _NameSelections) foreach (CNameSelection ns in _NameSelections)
ns.UnloadTextures(); ns.UnloadTextures();
foreach (CPlaylist pls in _Playlists) foreach (CPlaylist pls in _Playlists)
pls.UnloadTextures(); pls.UnloadTextures();
+39 -41
View File
@@ -176,7 +176,7 @@ namespace VocaluxeLib.Menu
{ {
if (EditMode == EEditMode.ChangeOrder && _ChangeOrderSource != -1 && _PlaylistElements.Count > _ChangeOrderSource) if (EditMode == EEditMode.ChangeOrder && _ChangeOrderSource != -1 && _PlaylistElements.Count > _ChangeOrderSource)
{ {
CBase.Playlist.DeletePlaylistSong(ActivePlaylistID, _PlaylistElements[_ChangeOrderSource].Content); CBase.Playlist.DeleteSong(ActivePlaylistID, _PlaylistElements[_ChangeOrderSource].Content);
UpdatePlaylist(); UpdatePlaylist();
} }
_ChangeOrderSource = -1; _ChangeOrderSource = -1;
@@ -503,13 +503,13 @@ namespace VocaluxeLib.Menu
switch (keyEvent.Key) switch (keyEvent.Key)
{ {
case Keys.Enter: case Keys.Enter:
CBase.Playlist.SetPlaylistName(ActivePlaylistID, _Theme.ButtonPlaylistName.Text.Text); CBase.Playlist.SetName(ActivePlaylistID, _Theme.ButtonPlaylistName.Text.Text);
CBase.Playlist.SavePlaylist(ActivePlaylistID); CBase.Playlist.Save(ActivePlaylistID);
EditMode = EEditMode.None; EditMode = EEditMode.None;
_Theme.ButtonPlaylistName.EditMode = false; _Theme.ButtonPlaylistName.EditMode = false;
break; break;
case Keys.Escape: case Keys.Escape:
_Theme.ButtonPlaylistName.Text.Text = CBase.Playlist.GetPlaylistName(ActivePlaylistID); _Theme.ButtonPlaylistName.Text.Text = CBase.Playlist.GetName(ActivePlaylistID);
EditMode = EEditMode.None; EditMode = EEditMode.None;
_Theme.ButtonPlaylistName.EditMode = false; _Theme.ButtonPlaylistName.EditMode = false;
break; break;
@@ -600,7 +600,7 @@ namespace VocaluxeLib.Menu
break; break;
case Keys.Delete: case Keys.Delete:
CBase.Playlist.DeletePlaylistSong(ActivePlaylistID, _PlaylistElements[CurrentPlaylistElement].Content); CBase.Playlist.DeleteSong(ActivePlaylistID, _PlaylistElements[CurrentPlaylistElement].Content);
UpdatePlaylist(); UpdatePlaylist();
if (Offset > 0) if (Offset > 0)
@@ -626,7 +626,7 @@ namespace VocaluxeLib.Menu
case Keys.Add: //move the selected song up case Keys.Add: //move the selected song up
if (_PlaylistElementContents.Count > 1 && (CurrentPlaylistElement > 0 || Offset > 0)) if (_PlaylistElementContents.Count > 1 && (CurrentPlaylistElement > 0 || Offset > 0))
{ {
CBase.Playlist.MovePlaylistSongUp(ActivePlaylistID, CurrentPlaylistElement + Offset); CBase.Playlist.MoveSongUp(ActivePlaylistID, CurrentPlaylistElement + Offset);
UpdatePlaylist(); UpdatePlaylist();
var key = new SKeyEvent {Key = Keys.Up}; var key = new SKeyEvent {Key = Keys.Up};
@@ -655,7 +655,7 @@ namespace VocaluxeLib.Menu
case Keys.Subtract: //move the selected song down case Keys.Subtract: //move the selected song down
if (_PlaylistElementContents.Count > 1 && CurrentPlaylistElement + Offset < _PlaylistElementContents.Count - 1) if (_PlaylistElementContents.Count > 1 && CurrentPlaylistElement + Offset < _PlaylistElementContents.Count - 1)
{ {
CBase.Playlist.MovePlaylistSongDown(ActivePlaylistID, CurrentPlaylistElement + Offset); CBase.Playlist.MoveSongDown(ActivePlaylistID, CurrentPlaylistElement + Offset);
UpdatePlaylist(); UpdatePlaylist();
var key = new SKeyEvent {Key = Keys.Down}; var key = new SKeyEvent {Key = Keys.Down};
@@ -724,7 +724,7 @@ namespace VocaluxeLib.Menu
if (CurrentPlaylistElement != -1) if (CurrentPlaylistElement != -1)
{ {
CBase.Playlist.GetPlaylistSong(ActivePlaylistID, CurrentPlaylistElement + Offset).GameMode = CBase.Playlist.GetSong(ActivePlaylistID, CurrentPlaylistElement + Offset).GameMode =
_PlaylistElementContents[CurrentPlaylistElement + Offset].Modes[_PlaylistElements[CurrentPlaylistElement].SelectSlide.Selection]; _PlaylistElementContents[CurrentPlaylistElement + Offset].Modes[_PlaylistElements[CurrentPlaylistElement].SelectSlide.Selection];
UpdatePlaylist(); UpdatePlaylist();
} }
@@ -736,7 +736,7 @@ namespace VocaluxeLib.Menu
if (CurrentPlaylistElement != -1) if (CurrentPlaylistElement != -1)
{ {
CBase.Playlist.GetPlaylistSong(ActivePlaylistID, CurrentPlaylistElement + Offset).GameMode = CBase.Playlist.GetSong(ActivePlaylistID, CurrentPlaylistElement + Offset).GameMode =
_PlaylistElementContents[CurrentPlaylistElement + Offset].Modes[_PlaylistElements[CurrentPlaylistElement].SelectSlide.Selection]; _PlaylistElementContents[CurrentPlaylistElement + Offset].Modes[_PlaylistElements[CurrentPlaylistElement].SelectSlide.Selection];
UpdatePlaylist(); UpdatePlaylist();
} }
@@ -764,10 +764,10 @@ namespace VocaluxeLib.Menu
else if (_Theme.ButtonPlaylistSing.Selected) else if (_Theme.ButtonPlaylistSing.Selected)
_StartPlaylistSongs(); _StartPlaylistSongs();
else if (_Theme.ButtonPlaylistSave.Selected) else if (_Theme.ButtonPlaylistSave.Selected)
CBase.Playlist.SavePlaylist(ActivePlaylistID); CBase.Playlist.Save(ActivePlaylistID);
else if (_Theme.ButtonPlaylistDelete.Selected) else if (_Theme.ButtonPlaylistDelete.Selected)
{ {
CBase.Playlist.DeletePlaylist(ActivePlaylistID); CBase.Playlist.Delete(ActivePlaylistID);
ClosePlaylist(); ClosePlaylist();
} }
else if (_Theme.ButtonPlaylistName.Selected) else if (_Theme.ButtonPlaylistName.Selected)
@@ -888,7 +888,7 @@ namespace VocaluxeLib.Menu
//Delete Entry with RB //Delete Entry with RB
if (CHelper.IsInBounds(_PlaylistElements[i].Background.Rect, mouseEvent) && mouseEvent.RB && _PlaylistElements[i].Content != -1) if (CHelper.IsInBounds(_PlaylistElements[i].Background.Rect, mouseEvent) && mouseEvent.RB && _PlaylistElements[i].Content != -1)
{ {
CBase.Playlist.DeletePlaylistSong(ActivePlaylistID, _PlaylistElements[i].Content); CBase.Playlist.DeleteSong(ActivePlaylistID, _PlaylistElements[i].Content);
UpdatePlaylist(); UpdatePlaylist();
return true; return true;
} }
@@ -906,7 +906,7 @@ namespace VocaluxeLib.Menu
{ {
if (CurrentPlaylistElement != -1) if (CurrentPlaylistElement != -1)
{ {
CBase.Playlist.GetPlaylistSong(ActivePlaylistID, CurrentPlaylistElement + Offset).GameMode = CBase.Playlist.GetSong(ActivePlaylistID, CurrentPlaylistElement + Offset).GameMode =
_PlaylistElementContents[CurrentPlaylistElement + Offset].Modes[_PlaylistElements[CurrentPlaylistElement].SelectSlide.Selection]; _PlaylistElementContents[CurrentPlaylistElement + Offset].Modes[_PlaylistElements[CurrentPlaylistElement].SelectSlide.Selection];
UpdatePlaylist(); UpdatePlaylist();
} }
@@ -922,12 +922,12 @@ namespace VocaluxeLib.Menu
} }
if (_Theme.ButtonPlaylistSave.Selected) if (_Theme.ButtonPlaylistSave.Selected)
{ {
CBase.Playlist.SavePlaylist(ActivePlaylistID); CBase.Playlist.Save(ActivePlaylistID);
return true; return true;
} }
if (_Theme.ButtonPlaylistDelete.Selected) if (_Theme.ButtonPlaylistDelete.Selected)
{ {
CBase.Playlist.DeletePlaylist(ActivePlaylistID); CBase.Playlist.Delete(ActivePlaylistID);
ClosePlaylist(); ClosePlaylist();
return true; return true;
} }
@@ -981,14 +981,14 @@ namespace VocaluxeLib.Menu
if (CurrentPlaylistElement != -1) if (CurrentPlaylistElement != -1)
{ {
CBase.Playlist.InsertPlaylistSong(ActivePlaylistID, CurrentPlaylistElement + Offset, DragAndDropSongID, gm); CBase.Playlist.InsertSong(ActivePlaylistID, CurrentPlaylistElement + Offset, DragAndDropSongID, gm);
UpdatePlaylist(); UpdatePlaylist();
} }
else else
{ {
if (mouseEvent.Y < _PlaylistElements[0].Background.Rect.Y && Offset == 0) if (mouseEvent.Y < _PlaylistElements[0].Background.Rect.Y && Offset == 0)
{ {
CBase.Playlist.InsertPlaylistSong(ActivePlaylistID, 0, DragAndDropSongID, gm); CBase.Playlist.InsertSong(ActivePlaylistID, 0, DragAndDropSongID, gm);
UpdatePlaylist(); UpdatePlaylist();
} }
else else
@@ -1007,7 +1007,7 @@ namespace VocaluxeLib.Menu
if (mouseEvent.Y > min) if (mouseEvent.Y > min)
{ {
CBase.Playlist.AddPlaylistSong(ActivePlaylistID, DragAndDropSongID, gm); CBase.Playlist.AddSong(ActivePlaylistID, DragAndDropSongID, gm);
UpdatePlaylist(); UpdatePlaylist();
ScrollToBottom(); ScrollToBottom();
} }
@@ -1028,8 +1028,8 @@ namespace VocaluxeLib.Menu
{ {
if (_Theme.ButtonPlaylistName.Selected) if (_Theme.ButtonPlaylistName.Selected)
{ {
CBase.Playlist.SetPlaylistName(ActivePlaylistID, _Theme.ButtonPlaylistName.Text.Text); CBase.Playlist.SetName(ActivePlaylistID, _Theme.ButtonPlaylistName.Text.Text);
CBase.Playlist.SavePlaylist(ActivePlaylistID); CBase.Playlist.Save(ActivePlaylistID);
EditMode = EEditMode.None; EditMode = EEditMode.None;
return true; return true;
} }
@@ -1038,7 +1038,7 @@ namespace VocaluxeLib.Menu
{ {
if (_Theme.ButtonPlaylistName.Selected) if (_Theme.ButtonPlaylistName.Selected)
{ {
_Theme.ButtonPlaylistName.Text.Text = CBase.Playlist.GetPlaylistName(ActivePlaylistID); _Theme.ButtonPlaylistName.Text.Text = CBase.Playlist.GetName(ActivePlaylistID);
EditMode = EEditMode.None; EditMode = EEditMode.None;
_Theme.ButtonPlaylistName.EditMode = false; _Theme.ButtonPlaylistName.EditMode = false;
return true; return true;
@@ -1058,13 +1058,13 @@ namespace VocaluxeLib.Menu
{ {
if (CurrentPlaylistElement != -1 && CurrentPlaylistElement + Offset != _ChangeOrderSource) if (CurrentPlaylistElement != -1 && CurrentPlaylistElement + Offset != _ChangeOrderSource)
{ {
CBase.Playlist.MovePlaylistSong(ActivePlaylistID, _ChangeOrderSource, CurrentPlaylistElement + Offset); CBase.Playlist.MoveSong(ActivePlaylistID, _ChangeOrderSource, CurrentPlaylistElement + Offset);
UpdatePlaylist(); UpdatePlaylist();
} }
else if (CurrentPlaylistElement == -1) else if (CurrentPlaylistElement == -1)
{ {
if (mouseEvent.Y < _PlaylistElements[0].Background.Rect.Y && Offset == 0) if (mouseEvent.Y < _PlaylistElements[0].Background.Rect.Y && Offset == 0)
CBase.Playlist.MovePlaylistSong(ActivePlaylistID, _ChangeOrderSource, 0); CBase.Playlist.MoveSong(ActivePlaylistID, _ChangeOrderSource, 0);
else else
{ {
if (_PlaylistElements.Count + Offset >= _PlaylistElementContents.Count) if (_PlaylistElements.Count + Offset >= _PlaylistElementContents.Count)
@@ -1080,7 +1080,7 @@ namespace VocaluxeLib.Menu
} }
if (mouseEvent.Y > min) if (mouseEvent.Y > min)
CBase.Playlist.MovePlaylistSong(ActivePlaylistID, _ChangeOrderSource, _PlaylistElementContents.Count - 1); CBase.Playlist.MoveSong(ActivePlaylistID, _ChangeOrderSource, _PlaylistElementContents.Count - 1);
} }
} }
@@ -1134,35 +1134,33 @@ namespace VocaluxeLib.Menu
public bool LoadPlaylist(int playlistID) public bool LoadPlaylist(int playlistID)
{ {
if (playlistID > -1 && playlistID < CBase.Playlist.GetNumPlaylists()) if (!CBase.Playlist.Exists(playlistID))
{ return false;
ActivePlaylistID = playlistID; ActivePlaylistID = playlistID;
_Theme.ButtonPlaylistName.Text.Text = CBase.Playlist.GetPlaylistName(ActivePlaylistID); _Theme.ButtonPlaylistName.Text.Text = CBase.Playlist.GetName(ActivePlaylistID);
_PlaylistElementContents.Clear(); _PlaylistElementContents.Clear();
for (int i = 0; i < CBase.Playlist.GetPlaylistSongCount(ActivePlaylistID); i++) for (int i = 0; i < CBase.Playlist.GetSongCount(ActivePlaylistID); i++)
{ {
var pec = new CPlaylistElementContent var pec = new CPlaylistElementContent
{ {
SongID = CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).SongID, SongID = CBase.Playlist.GetSong(ActivePlaylistID, i).SongID,
Modes = CBase.Songs.GetSongByID(CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).SongID).AvailableGameModes, Modes = CBase.Songs.GetSongByID(CBase.Playlist.GetSong(ActivePlaylistID, i).SongID).AvailableGameModes,
Mode = CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).GameMode Mode = CBase.Playlist.GetSong(ActivePlaylistID, i).GameMode
}; };
_PlaylistElementContents.Add(pec); _PlaylistElementContents.Add(pec);
} }
Update(); Update();
return true; return true;
} }
return false;
}
public void UpdatePlaylist() public void UpdatePlaylist()
{ {
_PlaylistElementContents.Clear(); _PlaylistElementContents.Clear();
for (int i = 0; i < CBase.Playlist.GetPlaylistSongCount(ActivePlaylistID); i++) for (int i = 0; i < CBase.Playlist.GetSongCount(ActivePlaylistID); i++)
{ {
var pec = new CPlaylistElementContent {SongID = CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).SongID}; var pec = new CPlaylistElementContent {SongID = CBase.Playlist.GetSong(ActivePlaylistID, i).SongID};
pec.Modes = CBase.Songs.GetSongByID(pec.SongID).AvailableGameModes; pec.Modes = CBase.Songs.GetSongByID(pec.SongID).AvailableGameModes;
pec.Mode = CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).GameMode; pec.Mode = CBase.Playlist.GetSong(ActivePlaylistID, i).GameMode;
_PlaylistElementContents.Add(pec); _PlaylistElementContents.Add(pec);
} }
@@ -1181,10 +1179,10 @@ namespace VocaluxeLib.Menu
CBase.Game.Reset(); CBase.Game.Reset();
CBase.Game.ClearSongs(); CBase.Game.ClearSongs();
if (ActivePlaylistID > -1 && ActivePlaylistID < CBase.Playlist.GetNumPlaylists()) if (CBase.Playlist.Exists(ActivePlaylistID))
{ {
for (int i = 0; i < CBase.Playlist.GetPlaylistSongCount(ActivePlaylistID); i++) for (int i = 0; i < CBase.Playlist.GetSongCount(ActivePlaylistID); i++)
CBase.Game.AddSong(CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).SongID, CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).GameMode); CBase.Game.AddSong(CBase.Playlist.GetSong(ActivePlaylistID, i).SongID, CBase.Playlist.GetSong(ActivePlaylistID, i).GameMode);
if (CBase.Game.GetNumSongs() > 0) if (CBase.Game.GetNumSongs() > 0)
CBase.Graphics.FadeTo(EScreens.ScreenNames); //TODO: What is if someone uses that in PartyMode? CBase.Graphics.FadeTo(EScreens.ScreenNames); //TODO: What is if someone uses that in PartyMode?
} }
@@ -1195,7 +1193,7 @@ namespace VocaluxeLib.Menu
CBase.Game.Reset(); CBase.Game.Reset();
CBase.Game.ClearSongs(); CBase.Game.ClearSongs();
CBase.Game.AddSong(CBase.Playlist.GetPlaylistSong(ActivePlaylistID, selected).SongID, CBase.Playlist.GetPlaylistSong(ActivePlaylistID, selected).GameMode); CBase.Game.AddSong(CBase.Playlist.GetSong(ActivePlaylistID, selected).SongID, CBase.Playlist.GetSong(ActivePlaylistID, selected).GameMode);
if (CBase.Game.GetNumSongs() > 0) if (CBase.Game.GetNumSongs() > 0)
CBase.Graphics.FadeTo(EScreens.ScreenNames); CBase.Graphics.FadeTo(EScreens.ScreenNames);
@@ -1203,7 +1201,7 @@ namespace VocaluxeLib.Menu
public void Update() public void Update()
{ {
if (ActivePlaylistID > -1 && ActivePlaylistID < CBase.Playlist.GetNumPlaylists()) if (CBase.Playlist.Exists(ActivePlaylistID))
{ {
for (int i = 0; i < _PlaylistElements.Count; i++) for (int i = 0; i < _PlaylistElements.Count; i++)
{ {
+8 -31
View File
@@ -188,43 +188,20 @@ namespace VocaluxeLib.Menu
public void Draw(bool forceDraw = false) public void Draw(bool forceDraw = false)
{ {
Draw(1f, Rect.Z, Aspect, forceDraw); Draw(Aspect, 1f, 0f, forceDraw);
} }
public void Draw(EAspect aspect) public void Draw(EAspect aspect, float scale = 1f, float zModify = 0f, bool forceDraw = false)
{
Draw(1f, Rect.Z, aspect);
}
public void Draw(float scale, EAspect aspect)
{
Draw(scale, Rect.Z, aspect);
}
public void Draw(float scale, float z, EAspect aspect, bool forceDraw = false)
{ {
CTexture texture = Texture ?? new CTexture((int)Rect.W, (int)Rect.H); CTexture texture = Texture ?? new CTexture((int)Rect.W, (int)Rect.H);
var bounds = new SRectF( SRectF bounds = Rect.Scale(scale);
Rect.X - Rect.W * (scale - 1f), SRectF rect;
Rect.Y - Rect.H * (scale - 1f),
Rect.W + 2 * Rect.W * (scale - 1f),
Rect.H + 2 * Rect.H * (scale - 1f),
z);
SRectF rect = bounds;
if (aspect != EAspect.Stretch) if (aspect != EAspect.Stretch)
{ CHelper.SetRect(bounds, out rect, texture.OrigAspect, aspect);
var bounds2 = new RectangleF(bounds.X, bounds.Y, bounds.W, bounds.H); else
RectangleF rect2; rect = bounds;
CHelper.SetRect(bounds2, out rect2, texture.OrigAspect, aspect); rect.Z = Rect.Z + zModify;
rect.X = rect2.X;
rect.Y = rect2.Y;
rect.W = rect2.Width;
rect.H = rect2.Height;
}
var color = new SColorF(Color.R, Color.G, Color.B, Color.A * Alpha); var color = new SColorF(Color.R, Color.G, Color.B, Color.A * Alpha);
if (Visible || forceDraw || (CBase.Settings.GetProgramState() == EProgramState.EditTheme)) if (Visible || forceDraw || (CBase.Settings.GetProgramState() == EProgramState.EditTheme))
+31 -54
View File
@@ -33,16 +33,29 @@ namespace VocaluxeLib.Menu.SongMenu
_CreateSongMenu(); _CreateSongMenu();
} }
#region ISongMenu
public bool Selected public bool Selected
{ {
get { return _SongMenu.IsSelected(); } get { return _SongMenu.Selected; }
set { _SongMenu.SetSelected(value); } set { _SongMenu.Selected = value; }
} }
public bool Visible public bool Visible
{ {
get { return _SongMenu.IsVisible(); } get { return _SongMenu.Visible; }
set { _SongMenu.SetVisible(value); } set { _SongMenu.Visible = value; }
}
public bool Active
{
get { return _SongMenu.Active; }
set { _SongMenu.Active = value; }
}
public bool SmallView
{
get { return _SongMenu.SmallView; }
set { _SongMenu.SmallView = value; }
} }
public SRectF Rect public SRectF Rect
@@ -50,7 +63,6 @@ namespace VocaluxeLib.Menu.SongMenu
get { return _SongMenu.Rect; } get { return _SongMenu.Rect; }
} }
#region ISongMenu
public void Update(SScreenSongOptions songOptions) public void Update(SScreenSongOptions songOptions)
{ {
_SongMenu.Update(songOptions); _SongMenu.Update(songOptions);
@@ -66,14 +78,14 @@ namespace VocaluxeLib.Menu.SongMenu
_SongMenu.OnHide(); _SongMenu.OnHide();
} }
public void HandleInput(ref SKeyEvent keyEvent, SScreenSongOptions songOptions) public bool HandleInput(ref SKeyEvent keyEvent, SScreenSongOptions options)
{ {
_SongMenu.HandleInput(ref keyEvent, songOptions); return _SongMenu.HandleInput(ref keyEvent, options);
} }
public void HandleMouse(ref SMouseEvent mouseEvent, SScreenSongOptions songOptions) public bool HandleMouse(ref SMouseEvent mouseEvent, SScreenSongOptions songOptions)
{ {
_SongMenu.HandleMouse(ref mouseEvent, songOptions); return _SongMenu.HandleMouse(ref mouseEvent, songOptions);
} }
public void Draw() public void Draw()
@@ -81,24 +93,19 @@ namespace VocaluxeLib.Menu.SongMenu
_SongMenu.Draw(); _SongMenu.Draw();
} }
public bool IsActive() public bool IsMouseOverSelectedSong(SMouseEvent mEvent)
{ {
return _SongMenu.IsActive(); return _SongMenu.IsMouseOverSelectedSong(mEvent);
} }
public void SetActive(bool active) public int GetPreviewSongNr()
{ {
_SongMenu.SetActive(active); return _SongMenu.GetPreviewSongNr();
} }
public bool IsMouseOverActualSelection(SMouseEvent mEvent) public int GetSelectedSongNr()
{ {
return _SongMenu.IsMouseOverActualSelection(mEvent); return _SongMenu.GetSelectedSongNr();
}
public int GetSelectedSong()
{
return _SongMenu.GetSelectedSong();
} }
public CStatic GetSelectedSongCover() public CStatic GetSelectedSongCover()
@@ -121,44 +128,14 @@ namespace VocaluxeLib.Menu.SongMenu
_SongMenu.SetSelectedCategory(categoryNr); _SongMenu.SetSelectedCategory(categoryNr);
} }
public bool EnterCurrentCategory() public bool EnterSelectedCategory()
{ {
return _SongMenu.EnterCurrentCategory(); return _SongMenu.EnterSelectedCategory();
} }
public int GetActualSelection() public int GetPreviewSong()
{ {
return _SongMenu.GetActualSelection(); return _SongMenu.GetPreviewSong();
}
public bool IsSelected()
{
return _SongMenu.IsSelected();
}
public void SetSelected(bool selected)
{
_SongMenu.SetSelected(selected);
}
public bool IsVisible()
{
return _SongMenu.IsVisible();
}
public void SetVisible(bool visible)
{
_SongMenu.SetVisible(visible);
}
public bool IsSmallView()
{
return _SongMenu.IsSmallView();
}
public void SetSmallView(bool smallView)
{
_SongMenu.SetSmallView(smallView);
} }
#endregion ISongMenu #endregion ISongMenu
@@ -15,11 +15,33 @@
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>. // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
#endregion #endregion
using VocaluxeLib.PartyModes;
namespace VocaluxeLib.Menu.SongMenu namespace VocaluxeLib.Menu.SongMenu
{ {
class CSongMenuBook : CSongMenuFramework class CSongMenuBook : CSongMenuFramework
{ {
public CSongMenuBook(int partyModeID) public CSongMenuBook(int partyModeID)
: base(partyModeID) {} : base(partyModeID) {}
public override float SelectedTileZoomFactor
{
get { return 1.2f; }
}
public override bool HandleInput(ref SKeyEvent keyEvent, SScreenSongOptions options)
{
return false;
}
public override bool HandleMouse(ref SMouseEvent mouseEvent, SScreenSongOptions songOptions)
{
return false;
}
public override CStatic GetSelectedSongCover()
{
return null;
}
} }
} }
+22 -7
View File
@@ -15,6 +15,8 @@
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>. // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
#endregion #endregion
using VocaluxeLib.PartyModes;
namespace VocaluxeLib.Menu.SongMenu namespace VocaluxeLib.Menu.SongMenu
{ {
class CSongMenuDreidel : CSongMenuFramework class CSongMenuDreidel : CSongMenuFramework
@@ -30,13 +32,6 @@ namespace VocaluxeLib.Menu.SongMenu
private CText _Artist; private CText _Artist;
private CText _Title; private CText _Title;
private CText _SongLength; private CText _SongLength;
private int _actualSelection = -1;
public override int GetActualSelection()
{
return _actualSelection;
}
*/ */
public CSongMenuDreidel(int partyModeID) public CSongMenuDreidel(int partyModeID)
@@ -59,5 +54,25 @@ namespace VocaluxeLib.Menu.SongMenu
} }
// ReSharper restore RedundantOverridenMember // ReSharper restore RedundantOverridenMember
public override float SelectedTileZoomFactor
{
get { return 1.2f; }
}
public override bool HandleInput(ref SKeyEvent keyEvent, SScreenSongOptions options)
{
return false;
}
public override bool HandleMouse(ref SMouseEvent mouseEvent, SScreenSongOptions songOptions)
{
return false;
}
public override CStatic GetSelectedSongCover()
{
return null;
}
} }
} }
+120 -186
View File
@@ -16,7 +16,7 @@
#endregion #endregion
using System; using System;
using System.Collections.Generic; using System.Diagnostics;
using System.IO; using System.IO;
using System.Xml; using System.Xml;
using VocaluxeLib.Draw; using VocaluxeLib.Draw;
@@ -98,81 +98,65 @@ namespace VocaluxeLib.Menu.SongMenu
protected SThemeSongMenu _Theme; protected SThemeSongMenu _Theme;
private bool _ThemeLoaded; private bool _ThemeLoaded;
private CFading _VideoFading;
private readonly List<int> _Streams = new List<int>();
protected CTexture _Vidtex;
protected bool _Initialized; protected bool _Initialized;
protected int _LastKnownNumSongs;
protected int _LastKnownCategory = -1;
protected SColorF _Color; private int _PreviewNrInternal = -1;
protected virtual int _PreviewNr
protected bool _Active;
protected float _MaxVolume = 100f;
//the real selected song for singing
protected int _Locked { get; set; }
protected int _PreviewIdInternal = -1;
protected virtual int _PreviewId
{ {
get { return _PreviewIdInternal; } get { return _PreviewNrInternal; }
set set
{ {
//Do this first, otherwhise song will restart if (_PreviewNrInternal == value)
return;
if (CBase.Songs.IsInCategory())
{
if (value >= CBase.Songs.GetNumSongsVisible())
value = -1;
_PlaySong(value); _PlaySong(value);
_PreviewIdInternal = value; }
else if (value >= CBase.Songs.GetNumCategories())
{
value = -1;
CBase.BackgroundMusic.Stop();
}
_PreviewNrInternal = value;
} }
} }
protected int _PreviewSongStream { get; private set; } private SColorF _ColorInternal;
protected SColorF _Color
{
get { return _ColorInternal; }
}
protected int _PreviewVideoStream { get; private set; } public int GetPreviewSong()
{
return _PreviewNr;
}
public SRectF Rect { get; protected set; } public SRectF Rect { get; protected set; }
public bool Active { get; set; }
public SColorF Color
{
get { return _Color; }
}
public virtual int GetActualSelection()
{
return -1;
}
private bool _Selected; private bool _Selected;
private bool _Visible = true; public bool Selected
public bool IsSelected()
{ {
return _Selected; get { return _Selected; }
} set
public void SetSelected(bool selected)
{ {
_Selected = selected; _Selected = value;
SetActive(selected); Active = value;
} }
public bool IsVisible()
{
return _Visible;
}
public void SetVisible(bool visible)
{
_Visible = visible;
} }
public bool Visible { get; set; }
public virtual bool SmallView { get; set; }
public abstract float SelectedTileZoomFactor { get; }
// This is the nr of the current selection (song or category)
protected virtual int _SelectionNr { get; set; }
protected CSongMenuFramework(int partyModeID) protected CSongMenuFramework(int partyModeID)
{ {
Visible = true;
_PartyModeID = partyModeID; _PartyModeID = partyModeID;
_PreviewVideoStream = -1;
_PreviewSongStream = -1;
_Locked = -1;
_Theme = new SThemeSongMenu _Theme = new SThemeSongMenu
{ {
SongMenuTileBoard = SongMenuTileBoard =
@@ -190,6 +174,7 @@ namespace VocaluxeLib.Menu.SongMenu
}; };
} }
#region Theme
public string GetThemeName() public string GetThemeName()
{ {
return _Theme.Name; return _Theme.Name;
@@ -208,13 +193,13 @@ namespace VocaluxeLib.Menu.SongMenu
_ThemeLoaded &= xmlReader.GetValue(item + "/MedleyTagIcon", out _Theme.MedleyTagIcon, String.Empty); _ThemeLoaded &= xmlReader.GetValue(item + "/MedleyTagIcon", out _Theme.MedleyTagIcon, String.Empty);
if (xmlReader.GetValue(item + "/Color", out _Theme.ColorName, String.Empty)) if (xmlReader.GetValue(item + "/Color", out _Theme.ColorName, String.Empty))
_ThemeLoaded &= CBase.Theme.GetColor(_Theme.ColorName, skinIndex, out _Color); _ThemeLoaded &= CBase.Theme.GetColor(_Theme.ColorName, skinIndex, out _ColorInternal);
else else
{ {
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref _Color.R); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/R", ref _ColorInternal.R);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/G", ref _Color.G); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/G", ref _ColorInternal.G);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/B", ref _Color.B); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/B", ref _ColorInternal.B);
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref _Color.A); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref _ColorInternal.A);
} }
#region SongMenuTileBoard #region SongMenuTileBoard
@@ -352,115 +337,88 @@ namespace VocaluxeLib.Menu.SongMenu
} }
return false; return false;
} }
#endregion Theme
public virtual void Init() public virtual void Init()
{ {
_Reset(); _ResetPreview(false);
_Initialized = true; _Initialized = true;
} }
public void UpdateRect(SRectF rect)
{
Rect = rect;
Init();
}
public virtual void Update(SScreenSongOptions songOptions) public virtual void Update(SScreenSongOptions songOptions)
{ {
if (!_Initialized) if (!_Initialized)
return; return;
if (_Streams.Count <= 0 || _PreviewVideoStream == -1)
return;
if (CBase.Video.IsFinished(_PreviewVideoStream) || CBase.Sound.IsFinished(_PreviewSongStream))
{
CBase.Video.Close(_PreviewVideoStream);
_PreviewVideoStream = -1;
return;
} }
float time = CBase.Sound.GetPosition(_PreviewSongStream); public virtual void OnShow() {}
float vtime;
if (CBase.Video.GetFrame(_PreviewVideoStream, ref _Vidtex, time, out vtime))
{
if (_Vidtex != null)
{
if (_VideoFading != null)
{
bool finished;
_Vidtex.Color.A = _VideoFading.GetValue(out finished);
if (finished)
_VideoFading = null;
}
}
}
}
public virtual void OnShow()
{
_PreviewSongStream = -1;
_Vidtex = null;
}
public virtual void OnHide() public virtual void OnHide()
{ {
_Reset(); if(CBase.Graphics.GetNextScreen() != EScreens.ScreenNames)
_ResetPreview();
} }
public virtual void HandleInput(ref SKeyEvent keyEvent, SScreenSongOptions songOptions) {} public abstract bool HandleInput(ref SKeyEvent keyEvent, SScreenSongOptions options);
public virtual void HandleMouse(ref SMouseEvent mouseEvent, SScreenSongOptions songOptions) {} public abstract bool HandleMouse(ref SMouseEvent mouseEvent, SScreenSongOptions songOptions);
public virtual void Draw() public virtual void Draw()
{ {
if (!_Initialized || !_Visible) if (!_Initialized || !Visible)
return; return;
if (_PreviewVideoStream != -1) if (CBase.BackgroundMusic.IsPlaying())
CBase.Drawing.DrawTexture(_Vidtex, new SRectF(0, 0, 1280, 720, 0)); CBase.Drawing.DrawTexture(CBase.BackgroundMusic.GetVideoTexture(), new SRectF(0, 0, 1280, 720, 0));
} }
public virtual bool IsActive() public bool IsMouseOverSelectedSong(SMouseEvent mEvent)
{ {
return _Active; CStatic selCov = GetSelectedSongCover();
return selCov != null && CHelper.IsInBounds(selCov.Rect.Scale(SelectedTileZoomFactor), mEvent);
} }
public virtual void SetActive(bool active) public int GetPreviewSongNr()
{
_Active = active;
}
public virtual bool IsMouseOverActualSelection(SMouseEvent mEvent)
{
return false;
}
public virtual int GetSelectedSong()
{ {
if (CBase.Songs.IsInCategory())
return _PreviewNr;
return -1; return -1;
} }
public virtual CStatic GetSelectedSongCover() public int GetSelectedSongNr()
{
return new CStatic(_PartyModeID);
}
public virtual int GetSelectedCategory()
{ {
if (CBase.Songs.IsInCategory())
return _SelectionNr;
return -1; return -1;
} }
public virtual void SetSelectedSong(int visibleSongNr) {} public abstract CStatic GetSelectedSongCover();
public virtual void SetSelectedCategory(int categoryNr) {} public int GetSelectedCategory()
public virtual void SetSmallView(bool smallView) {}
public virtual bool IsSmallView()
{ {
return false; if (!CBase.Songs.IsInCategory())
return _SelectionNr;
return -1;
}
public void SetSelectedSong(int visibleSongNr)
{
Debug.Assert(CBase.Songs.IsInCategory());
if (visibleSongNr >= 0 && visibleSongNr < CBase.Songs.GetNumSongsVisible())
_SelectionNr = visibleSongNr;
else
_SelectionNr = -1;
_PreviewNr = _SelectionNr;
}
public void SetSelectedCategory(int categoryNr)
{
Debug.Assert(!CBase.Songs.IsInCategory());
if (categoryNr >= 0 && categoryNr < CBase.Songs.GetNumCategories())
_SelectionNr = categoryNr;
else
_SelectionNr = -1;
_PreviewNr = _SelectionNr;
} }
public virtual void UnloadTextures() {} public virtual void UnloadTextures() {}
@@ -470,7 +428,7 @@ namespace VocaluxeLib.Menu.SongMenu
Init(); Init();
if (!String.IsNullOrEmpty(_Theme.ColorName)) if (!String.IsNullOrEmpty(_Theme.ColorName))
_Color = CBase.Theme.GetColor(_Theme.ColorName, _PartyModeID); _ColorInternal = CBase.Theme.GetColor(_Theme.ColorName, _PartyModeID);
} }
public void ReloadTextures() public void ReloadTextures()
@@ -479,29 +437,29 @@ namespace VocaluxeLib.Menu.SongMenu
LoadTextures(); LoadTextures();
} }
public bool EnterCurrentCategory() public bool EnterSelectedCategory()
{ {
if (!_Initialized) if (!_Initialized)
return false; return false;
if (CBase.Songs.IsInCategory() || _PreviewId < 0 || _PreviewId >= CBase.Songs.GetNumCategories()) if (CBase.Songs.IsInCategory() || GetSelectedCategory() < 0 || GetSelectedCategory() >= CBase.Songs.GetNumCategories())
return false; return false;
_EnterCategory(_PreviewId); _EnterCategory(GetSelectedCategory());
return true; return true;
} }
protected virtual void _EnterCategory(int category) protected virtual void _EnterCategory(int categoryNr)
{ {
if (!_Initialized) if (!_Initialized)
return; return;
if (category >= CBase.Songs.GetNumCategories()) if (categoryNr >= CBase.Songs.GetNumCategories())
return; return;
_Reset(); _ResetPreview(false);
CBase.Songs.SetCategory(category); CBase.Songs.SetCategory(categoryNr);
} }
protected virtual void _ShowCategories() protected virtual void _LeaveCategory()
{ {
if (!_Initialized) if (!_Initialized)
return; return;
@@ -509,74 +467,50 @@ namespace VocaluxeLib.Menu.SongMenu
if (!CBase.Songs.IsInCategory()) if (!CBase.Songs.IsInCategory())
return; return;
_Reset(); _ResetPreview();
CBase.Songs.SetCategory(-1); CBase.Songs.SetCategory(-1);
} }
protected void _PlaySong(int nr) private void _PlaySong(int nr)
{ {
if (CBase.Songs.IsInCategory() && (_PreviewId != nr || _Streams.Count == 0)) _PreviewNrInternal = -1;
{
_Reset();
CSong song = CBase.Songs.GetVisibleSong(nr); CSong song = CBase.Songs.GetVisibleSong(nr);
if (song == null) if (song == null)
return; return;
//TODO: Using prescan here causes Vocaluxe to hang a bit on loading the song but we need the length below CBase.BackgroundMusic.LoadPreview(song);
int stream = CBase.Sound.Load(Path.Combine(song.Folder, song.MP3FileName), true, true); }
float startposition = song.Preview.StartTime; protected void _ResetPreview(bool playBGagain = true)
float length = CBase.Sound.GetLength(stream);
if (song.Preview.Source == EDataSource.None)
startposition = length / 4f;
else if (startposition > length - 5f)
startposition = Math.Max(0f, Math.Min(length / 4f, length - 5f));
if (startposition >= 0.5f)
startposition -= 0.5f;
CBase.Sound.SetPosition(stream, startposition);
CBase.Sound.Play(stream);
CBase.Sound.SetStreamVolume(stream, 0f);
CBase.Sound.Fade(stream, 100f, 3f);
_Streams.Add(stream);
_PreviewSongStream = stream;
_PreviewIdInternal = nr;
if (song.VideoFileName != "" && CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON)
{ {
_PreviewVideoStream = CBase.Video.Load(Path.Combine(song.Folder, song.VideoFileName)); if (_PreviewNrInternal == -1)
if (_PreviewVideoStream == -1)
return; return;
CBase.Video.SetLoop(_PreviewVideoStream);
CBase.Video.Skip(_PreviewVideoStream, startposition, song.VideoGap);
_VideoFading = new CFading(0f, 1f, 3f);
}
}
}
protected void _Reset() CBase.BackgroundMusic.StopPreview();
{
foreach (int stream in _Streams)
CBase.Sound.FadeAndClose(stream, 0f, 0.75f);
_Streams.Clear();
CBase.Video.Close(_PreviewVideoStream); if (playBGagain)
_PreviewVideoStream = -1; CBase.BackgroundMusic.Play();
CBase.Drawing.RemoveTexture(ref _Vidtex); //Make sure we don't have a preview here otherwise a change won't be recognized
//(e.g. leave a category with one song and set preview to 0 --> previewOld=previewNew=0 --> No change --> Old data shown
//Use internal nr because this function gets called from withing setPreviewNr
_PreviewNrInternal = -1;
} }
#region ThemeEdit #region ThemeEdit
private void _UpdateRect(SRectF rect)
{
Rect = rect;
Init();
}
public void MoveElement(int stepX, int stepY) public void MoveElement(int stepX, int stepY)
{ {
SRectF rect = Rect; SRectF rect = Rect;
rect.X += stepX; rect.X += stepX;
rect.Y += stepY; rect.Y += stepY;
UpdateRect(rect); _UpdateRect(rect);
} }
public void ResizeElement(int stepW, int stepH) public void ResizeElement(int stepW, int stepH)
@@ -591,7 +525,7 @@ namespace VocaluxeLib.Menu.SongMenu
if (rect.H < 100) if (rect.H < 100)
rect.H = 100; rect.H = 100;
UpdateRect(rect); _UpdateRect(rect);
} }
#endregion ThemeEdit #endregion ThemeEdit
} }
@@ -15,11 +15,30 @@
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>. // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
#endregion #endregion
using VocaluxeLib.PartyModes;
namespace VocaluxeLib.Menu.SongMenu namespace VocaluxeLib.Menu.SongMenu
{ {
class CSongMenuList : CSongMenuFramework class CSongMenuList : CSongMenuFramework
{ {
public CSongMenuList(int partyModeID) public CSongMenuList(int partyModeID)
: base(partyModeID) {} : base(partyModeID) {}
public override float SelectedTileZoomFactor
{
get { return 1.2f; }
}
public override bool HandleInput(ref SKeyEvent keyEvent, SScreenSongOptions options)
{
return false;
}
public override bool HandleMouse(ref SMouseEvent mouseEvent, SScreenSongOptions songOptions) { return false; }
public override CStatic GetSelectedSongCover()
{
return null;
}
} }
} }
+251 -370
View File
@@ -37,8 +37,8 @@ namespace VocaluxeLib.Menu.SongMenu
private CStatic _MedleyCalcIcon; private CStatic _MedleyCalcIcon;
private CStatic _MedleyTagIcon; private CStatic _MedleyTagIcon;
private CTexture _CoverBigTexture; private CTexture _CoverBigBGTexture;
private CTexture _CoverTexture; private CTexture _CoverBGTexture;
private CText _Artist; private CText _Artist;
private CText _Title; private CText _Title;
@@ -53,63 +53,80 @@ namespace VocaluxeLib.Menu.SongMenu
private int _TileW; private int _TileW;
private int _TileH; private int _TileH;
private int _Offset = -1; // Offset is the song or categoryNr of the tile in the left upper corner
private int _ActualSelection = -1; private int _Offset;
private bool _SmallView;
private float _Length = -1f; private float _Length = -1f;
private int _LastKnownElements;
private int _LastKnownCategory;
private bool _MouseWasInRect;
public override float SelectedTileZoomFactor
{
get { return 1.2f; }
}
protected override int _SelectionNr
{
set
{
int max = CBase.Songs.IsInCategory() ? CBase.Songs.GetNumSongsVisible() : CBase.Songs.GetNumCategories();
base._SelectionNr = value.Clamp(-1, max - 1, true);
//Update list in case we scrolled
_UpdateList();
_UpdateTileSelection();
}
}
private void _UpdateTileSelection()
{
foreach (CStatic tile in _Tiles)
tile.Selected = false;
int tileNr = _SelectionNr - _Offset;
if (tileNr >= 0 && tileNr < _Tiles.Count)
_Tiles[tileNr].Selected = true;
}
public override bool SmallView
{
set
{
if (SmallView == value)
return;
base.SmallView = value;
_InitTiles();
_UpdateList(true);
_UpdateTileSelection();
}
}
public CSongMenuTileBoard(int partyModeID) public CSongMenuTileBoard(int partyModeID)
: base(partyModeID) {} : base(partyModeID) {}
protected override int _PreviewId protected override int _PreviewNr
{ {
set set
{ {
if (value == base._PreviewId) if (value == base._PreviewNr)
{
if (!CBase.BackgroundMusic.IsPlaying() && value != -1)
CBase.BackgroundMusic.PlayPreview();
return; return;
base._PreviewId = value; }
base._PreviewNr = value;
_UpdatePreview(); _UpdatePreview();
} }
} }
public override int GetActualSelection()
{
return _ActualSelection;
}
public override void Init() public override void Init()
{ {
base.Init(); base.Init();
Rect = _Theme.SongMenuTileBoard.TileRect;
_NumW = _Theme.SongMenuTileBoard.NumW;
_NumH = _Theme.SongMenuTileBoard.NumH;
_SpaceW = _Theme.SongMenuTileBoard.SpaceW; _SpaceW = _Theme.SongMenuTileBoard.SpaceW;
_SpaceH = _Theme.SongMenuTileBoard.SpaceH; _SpaceH = _Theme.SongMenuTileBoard.SpaceH;
_TileW = (int)((_Theme.SongMenuTileBoard.TileRect.W - _SpaceW * (_NumW - 1)) / _NumW);
_TileH = (int)((_Theme.SongMenuTileBoard.TileRect.H - _SpaceH * (_NumH - 1)) / _NumH);
_CoverTexture = CBase.Theme.GetSkinTexture(_Theme.CoverBackgroundName, _PartyModeID);
_CoverBigTexture = CBase.Theme.GetSkinTexture(_Theme.CoverBigBackgroundName, _PartyModeID);
_Tiles = new List<CStatic>();
for (int i = 0; i < _NumH; i++)
{
for (int j = 0; j < _NumW; j++)
{
var rect = new SRectF(_Theme.SongMenuTileBoard.TileRect.X + j * (_TileW + _SpaceW),
_Theme.SongMenuTileBoard.TileRect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z);
var tile = new CStatic(_PartyModeID, _CoverTexture, Color, rect);
_Tiles.Add(tile);
}
}
_ScrollRect = new SRectF(0, 0, CBase.Settings.GetRenderW(), CBase.Settings.GetRenderH(), _Theme.SongMenuTileBoard.TileRect.Z);
_CoverBig = _Theme.SongMenuTileBoard.StaticCoverBig; _CoverBig = _Theme.SongMenuTileBoard.StaticCoverBig;
_TextBG = _Theme.SongMenuTileBoard.StaticTextBG; _TextBG = _Theme.SongMenuTileBoard.StaticTextBG;
_DuetIcon = _Theme.SongMenuTileBoard.StaticDuetIcon; _DuetIcon = _Theme.SongMenuTileBoard.StaticDuetIcon;
@@ -121,8 +138,42 @@ namespace VocaluxeLib.Menu.SongMenu
_Title = _Theme.SongMenuTileBoard.TextTitle; _Title = _Theme.SongMenuTileBoard.TextTitle;
_SongLength = _Theme.SongMenuTileBoard.TextSongLength; _SongLength = _Theme.SongMenuTileBoard.TextSongLength;
_PreviewId = -1; _PreviewNr = -1;
_Offset = 0; _InitTiles();
}
private void _InitTiles()
{
if (SmallView)
{
_NumH = _Theme.SongMenuTileBoard.NumHsmall;
_NumW = _Theme.SongMenuTileBoard.NumWsmall;
Rect = _Theme.SongMenuTileBoard.TileRectSmall;
}
else
{
_NumH = _Theme.SongMenuTileBoard.NumH;
_NumW = _Theme.SongMenuTileBoard.NumW;
Rect = _Theme.SongMenuTileBoard.TileRect;
}
_TileW = (int)((Rect.W - _SpaceW * (_NumW - 1)) / _NumW);
_TileH = (int)((Rect.H - _SpaceH * (_NumH - 1)) / _NumH);
_CoverBGTexture = CBase.Theme.GetSkinTexture(_Theme.CoverBackgroundName, _PartyModeID);
_CoverBigBGTexture = CBase.Theme.GetSkinTexture(_Theme.CoverBigBackgroundName, _PartyModeID);
_Tiles = new List<CStatic>();
for (int i = 0; i < _NumH; i++)
{
for (int j = 0; j < _NumW; j++)
{
var rect = new SRectF(Rect.X + j * (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z);
var tile = new CStatic(_PartyModeID, _CoverBGTexture, _Color, rect);
_Tiles.Add(tile);
}
}
_ScrollRect = new SRectF(0, 0, CBase.Settings.GetRenderW(), CBase.Settings.GetRenderH(), Rect.Z);
} }
public override void Update(SScreenSongOptions songOptions) public override void Update(SScreenSongOptions songOptions)
@@ -130,21 +181,16 @@ namespace VocaluxeLib.Menu.SongMenu
base.Update(songOptions); base.Update(songOptions);
if (songOptions.Selection.RandomOnly) if (songOptions.Selection.RandomOnly)
{ _PreviewNr = _SelectionNr;
_Locked = _PreviewId;
_ActualSelection = _PreviewId;
for (int i = 0; i < _Tiles.Count; i++)
_Tiles[i].Selected = _Locked == i + _Offset;
}
if (_Length < 0 && CBase.Songs.IsInCategory() && CBase.Sound.GetLength(_PreviewSongStream) > 0) if (_Length < 0 && CBase.Songs.IsInCategory() && CBase.BackgroundMusic.GetLength() > 0)
_UpdateLength(CBase.Songs.GetVisibleSong(_PreviewId)); _UpdateLength(CBase.Songs.GetVisibleSong(_PreviewNr));
} }
private void _UpdatePreview() private void _UpdatePreview()
{ {
//First hide everything so we just have to set what we actually want //First hide everything so we just have to set what we actually want
_CoverBig.Texture = _CoverBigTexture; _CoverBig.Texture = _CoverBigBGTexture;
_Artist.Text = String.Empty; _Artist.Text = String.Empty;
_Title.Text = String.Empty; _Title.Text = String.Empty;
_SongLength.Text = String.Empty; _SongLength.Text = String.Empty;
@@ -155,12 +201,12 @@ namespace VocaluxeLib.Menu.SongMenu
_Length = -1f; _Length = -1f;
//Check if nothing is selected (for preview) //Check if nothing is selected (for preview)
if (_PreviewId < 0) if (_PreviewNr < 0)
return; return;
if (CBase.Songs.IsInCategory()) if (CBase.Songs.IsInCategory())
{ {
CSong song = CBase.Songs.GetVisibleSong(_PreviewId); CSong song = CBase.Songs.GetVisibleSong(_PreviewNr);
//Check if we have a valid song (song still visible, index >=0 etc is checked by framework) //Check if we have a valid song (song still visible, index >=0 etc is checked by framework)
if (song == null) if (song == null)
{ {
@@ -185,7 +231,7 @@ namespace VocaluxeLib.Menu.SongMenu
} }
else else
{ {
CCategory category = CBase.Songs.GetCategory(_PreviewId); CCategory category = CBase.Songs.GetCategory(_PreviewNr);
//Check if we have a valid category //Check if we have a valid category
if (category == null) if (category == null)
return; return;
@@ -202,7 +248,7 @@ namespace VocaluxeLib.Menu.SongMenu
{ {
if (song == null) if (song == null)
return; return;
float time = CBase.Sound.GetLength(_PreviewSongStream); float time = CBase.BackgroundMusic.GetLength();
if (Math.Abs(song.Finish) > 0.001) if (Math.Abs(song.Finish) > 0.001)
time = song.Finish; time = song.Finish;
@@ -221,272 +267,223 @@ namespace VocaluxeLib.Menu.SongMenu
public override void OnShow() public override void OnShow()
{ {
if (CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_OFF && CBase.Songs.GetNumCategories() > 0 && !CBase.Songs.IsInCategory()) _LastKnownElements = -1; //Force refresh of list
if (!CBase.Songs.IsInCategory())
{
if ((CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_OFF && CBase.Songs.GetNumCategories() > 0) || CBase.Songs.GetNumCategories() == 1)
_EnterCategory(0); _EnterCategory(0);
_ActualSelection = -1;
_Locked = -1;
_UpdateList(0, true);
//AfterCategoryChange();
SetSelectedSong(_PreviewId);
_AfterCategoryChange();
if (_PreviewId < 0)
{
_PreviewId = 0;
_Locked = 0;
} }
if (CBase.Songs.IsInCategory())
if (CBase.Songs.GetNumSongsVisible() == 0 && CBase.Songs.GetSearchFilter() != "") SetSelectedSong(_SelectionNr < 0 ? 0 : _SelectionNr);
{
_PreviewId = -1;
_Locked = -1;
}
}
public override void HandleInput(ref SKeyEvent keyEvent, SScreenSongOptions songOptions)
{
base.HandleInput(ref keyEvent, songOptions);
if (!keyEvent.KeyPressed)
{
if (!(keyEvent.Key == Keys.Left || keyEvent.Key == Keys.Right || keyEvent.Key == Keys.Up || keyEvent.Key == Keys.Down ||
keyEvent.Key == Keys.Escape || keyEvent.Key == Keys.Back || keyEvent.Key == Keys.Enter ||
keyEvent.Key == Keys.PageDown || keyEvent.Key == Keys.PageUp))
return;
bool sel = _Tiles.Any(tile => tile.Selected);
if ((_Locked == -1 || !sel) &&
(keyEvent.Key != Keys.Escape && keyEvent.Key != Keys.Back && keyEvent.Key != Keys.PageUp && keyEvent.Key != Keys.PageDown))
{
if (_PreviewId > -1)
_Locked = _PreviewId;
else else
{ SetSelectedCategory(_SelectionNr < 0 ? 0 : _SelectionNr);
_Locked = 0; _PreviewNr = _SelectionNr;
_ActualSelection = 0; _UpdateListIfRequired();
_PreviewId = 0;
_UpdateList(0, true);
} }
}
else public override bool HandleInput(ref SKeyEvent keyEvent, SScreenSongOptions options)
{ {
if (keyEvent.KeyPressed)
return false;
bool moveAllowed = !options.Selection.RandomOnly || (options.Selection.CategoryChangeAllowed && !CBase.Songs.IsInCategory());
bool catChangePossible = CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_ON && options.Selection.CategoryChangeAllowed;
//If nothing selected set a reasonable default value
if (keyEvent.IsArrowKey() && moveAllowed && _SelectionNr < 0)
_SelectionNr = (_PreviewNr < 0) ? _Offset : _PreviewNr;
switch (keyEvent.Key) switch (keyEvent.Key)
{ {
case Keys.Enter: case Keys.Enter:
if (!CBase.Songs.IsInCategory()) if (CBase.Songs.IsInCategory())
{ {
_EnterCategory(_PreviewId); if (_SelectionNr >= 0 && _PreviewNr != _SelectionNr)
{
_PreviewNr = _SelectionNr;
keyEvent.Handled = true;
}
}
else
{
_EnterCategory(_PreviewNr);
keyEvent.Handled = true; keyEvent.Handled = true;
} }
else if (_ActualSelection > -1 && _PreviewId >= 0)
_Locked = _ActualSelection;
break; break;
case Keys.Escape: case Keys.Escape:
case Keys.Back: case Keys.Back:
if (CBase.Songs.IsInCategory() && CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_ON && songOptions.Selection.CategoryChangeAllowed) if (CBase.Songs.IsInCategory() && catChangePossible)
{ {
_ShowCategories(); _LeaveCategory();
keyEvent.Handled = true; keyEvent.Handled = true;
} }
//else if (CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_OFF)
//{
// CGraphics.FadeTo(EScreens.ScreenMain);
//}
break; break;
case Keys.PageUp: case Keys.PageUp:
if (CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_ON && songOptions.Selection.CategoryChangeAllowed) if (catChangePossible)
{
_PrevCategory(); _PrevCategory();
keyEvent.Handled = true;
}
break; break;
case Keys.PageDown: case Keys.PageDown:
if (CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_ON && songOptions.Selection.CategoryChangeAllowed) if (catChangePossible)
{
_NextCategory(); _NextCategory();
keyEvent.Handled = true;
}
break; break;
case Keys.Left: case Keys.Left:
if (_Locked > 0 && (!songOptions.Selection.RandomOnly || songOptions.Selection.CategoryChangeAllowed && !CBase.Songs.IsInCategory())) //Check for >0 so we do not allow selection of nothing (-1)
if (_SelectionNr > 0 && moveAllowed)
{ {
_Locked--; _SelectionNr--;
_UpdateList(); keyEvent.Handled = true;
} }
break; break;
case Keys.Right: case Keys.Right:
if (!CBase.Songs.IsInCategory() && songOptions.Selection.CategoryChangeAllowed) if (moveAllowed)
{ {
if (_Locked < CBase.Songs.GetNumCategories() - 1) _SelectionNr++;
{ keyEvent.Handled = true;
_Locked++;
_UpdateList();
}
}
else
{
if (CBase.Songs.IsInCategory() && _Locked < CBase.Songs.GetNumSongsVisible() - 1 && !songOptions.Selection.RandomOnly)
{
_Locked++;
_UpdateList();
}
} }
break; break;
case Keys.Up: case Keys.Up:
if (keyEvent.ModShift && CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_ON && songOptions.Selection.CategoryChangeAllowed) if (keyEvent.ModShift)
{
if (catChangePossible)
{ {
_PrevCategory(); _PrevCategory();
break; keyEvent.Handled = true;
} }
}
if (_Locked > _NumW - 1 && else if (_SelectionNr >= _NumW && moveAllowed)
(!songOptions.Selection.RandomOnly || songOptions.Selection.CategoryChangeAllowed && !CBase.Songs.IsInCategory()))
{ {
_Locked -= _NumW; _SelectionNr -= _NumW;
_UpdateList(); keyEvent.Handled = true;
} }
break; break;
case Keys.Down: case Keys.Down:
if (keyEvent.ModShift && CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_ON && songOptions.Selection.CategoryChangeAllowed) if (keyEvent.ModShift)
{
if (catChangePossible)
{ {
_NextCategory(); _NextCategory();
break; keyEvent.Handled = true;
}
if (!CBase.Songs.IsInCategory() && songOptions.Selection.CategoryChangeAllowed)
{
if (_Locked < CBase.Songs.GetNumCategories() - _NumW)
{
_Locked += _NumW;
_UpdateList();
} }
} }
else if (_Locked < CBase.Songs.GetNumSongsVisible() - _NumW && !songOptions.Selection.RandomOnly) else if (moveAllowed)
{ {
_Locked += _NumW; _SelectionNr += _NumW;
_UpdateList(); keyEvent.Handled = true;
} }
break; break;
} }
if (!CBase.Songs.IsInCategory())
_PreviewNr = _SelectionNr;
return keyEvent.Handled;
} }
if (!keyEvent.Handled) public override bool HandleMouse(ref SMouseEvent mouseEvent, SScreenSongOptions songOptions)
{ {
_ActualSelection = _Locked;
_PreviewId = _Locked;
for (int i = 0; i < _Tiles.Count; i++)
_Tiles[i].Selected = _Locked == i + _Offset;
}
}
}
public override void HandleMouse(ref SMouseEvent mouseEvent, SScreenSongOptions songOptions)
{
base.HandleMouse(ref mouseEvent, songOptions);
int i = 0;
bool sel = false;
int lastselection = _ActualSelection;
if (!songOptions.Selection.RandomOnly || (!CBase.Songs.IsInCategory() && songOptions.Selection.CategoryChangeAllowed)) if (!songOptions.Selection.RandomOnly || (!CBase.Songs.IsInCategory() && songOptions.Selection.CategoryChangeAllowed))
{ {
if (mouseEvent.Wheel != 0 && CHelper.IsInBounds(_ScrollRect, mouseEvent))
_UpdateList(_Offset + _NumW * mouseEvent.Wheel);
int lastSelection = _SelectionNr;
int i = 0;
bool somethingSelected = false;
foreach (CStatic tile in _Tiles) foreach (CStatic tile in _Tiles)
{ {
if (tile.Texture != _CoverTexture && CHelper.IsInBounds(tile.Rect, mouseEvent) && !sel) if (tile.Texture != _CoverBGTexture && CHelper.IsInBounds(tile.Rect, mouseEvent))
{ {
if (mouseEvent.LB || !CBase.Songs.IsInCategory()) somethingSelected = true;
{ _SelectionNr = i + _Offset;
if (_PreviewId == i + _Offset) if (!CBase.Songs.IsInCategory())
_Locked = _PreviewId; _PreviewNr = i + _Offset;
else break;
{
_PreviewId = i + _Offset;
_Locked = -1;
} }
}
tile.Selected = true;
_ActualSelection = i + _Offset;
sel = true;
}
else
tile.Selected = false;
i++; i++;
} }
} //Reset selection only if we moved out of the rect to avoid loosing it when selecting random songs
else if (_MouseWasInRect && !somethingSelected)
sel = true; _SelectionNr = -1;
if (mouseEvent.Sender == ESender.WiiMote && _SelectionNr != lastSelection && _SelectionNr != -1)
if (mouseEvent.Sender == ESender.WiiMote && _ActualSelection != lastselection && _ActualSelection != -1)
CBase.Controller.SetRumble(0.050f); CBase.Controller.SetRumble(0.050f);
}
_MouseWasInRect = CHelper.IsInBounds(Rect, mouseEvent);
if (!sel) if (mouseEvent.RB)
_ActualSelection = -1; {
if (CBase.Songs.IsInCategory() && CBase.Songs.GetNumCategories() > 0 && CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_ON &&
if (mouseEvent.RB && (CBase.Songs.GetNumCategories() > 0) && CBase.Songs.IsInCategory() && CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_ON &&
songOptions.Selection.CategoryChangeAllowed) songOptions.Selection.CategoryChangeAllowed)
{ {
_ShowCategories(); _LeaveCategory();
mouseEvent.Handled = true; return true;
return;
} }
if (mouseEvent.RB && CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_OFF && !songOptions.Selection.PartyMode) if (CBase.Songs.GetTabs() == EOffOn.TR_CONFIG_OFF && !songOptions.Selection.PartyMode)
{
CBase.Graphics.FadeTo(EScreens.ScreenMain); CBase.Graphics.FadeTo(EScreens.ScreenMain);
else if (_PreviewId != -1 && mouseEvent.LB && CBase.Songs.GetCurrentCategoryIndex() != -1 && !songOptions.Selection.PartyMode) return true;
{
if (CHelper.IsInBounds(_CoverBig.Rect, mouseEvent) || CHelper.IsInBounds(_TextBG.Rect, mouseEvent))
_Locked = _PreviewId;
}
else if (mouseEvent.LB && (!CBase.Songs.IsInCategory()))
{
foreach (CStatic tile in _Tiles)
{
if (tile.Texture != _CoverTexture && CHelper.IsInBounds(tile.Rect, mouseEvent))
{
_EnterCategory(_PreviewId);
mouseEvent.Handled = true;
return;
} }
} }
else if (mouseEvent.LB)
{
if (_SelectionNr >= 0 && _MouseWasInRect)
{
if (CBase.Songs.IsInCategory())
{
if (_PreviewNr == _SelectionNr)
return false;
_PreviewNr = _SelectionNr;
} }
else
if (mouseEvent.Wheel != 0 && CHelper.IsInBounds(_ScrollRect, mouseEvent) && EnterSelectedCategory();
(!songOptions.Selection.RandomOnly || !CBase.Songs.IsInCategory() && songOptions.Selection.CategoryChangeAllowed)) return true;
_UpdateList(_Offset + _NumW * mouseEvent.Wheel); }
}
return false;
} }
public override void Draw() public override void Draw()
{ {
foreach (CStatic tile in _Tiles) foreach (CStatic tile in _Tiles)
{ {
if (tile.Selected && _Active) if (tile.Selected && Active)
tile.Draw(1.2f, tile.Rect.Z - 0.1f, EAspect.Crop); tile.Draw(EAspect.Crop, SelectedTileZoomFactor, -0.1f);
else else
{ {
EAspect aspect = (tile.Texture != _CoverTexture) ? EAspect.Crop : EAspect.Stretch; EAspect aspect = (tile.Texture != _CoverBGTexture) ? EAspect.Crop : EAspect.Stretch;
tile.Draw(1f, tile.Rect.Z, aspect); tile.Draw(aspect);
} }
} }
_TextBG.Draw(); _TextBG.Draw();
if (_Vidtex != null && _PreviewVideoStream != -1) CTexture vidtex = CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null;
if (vidtex != null)
{ {
if (_Vidtex.Color.A < 1) if (vidtex.Color.A < 1)
_CoverBig.Draw(1f, EAspect.Crop); _CoverBig.Draw(EAspect.Crop);
var bounds = new RectangleF(_CoverBig.Rect.X, _CoverBig.Rect.Y, _CoverBig.Rect.W, _CoverBig.Rect.H); var bounds = new RectangleF(_CoverBig.Rect.X, _CoverBig.Rect.Y, _CoverBig.Rect.W, _CoverBig.Rect.H);
RectangleF rect; RectangleF rect;
CHelper.SetRect(bounds, out rect, _Vidtex.OrigAspect, EAspect.Crop); CHelper.SetRect(bounds, out rect, vidtex.OrigAspect, EAspect.Crop);
var vidRect = new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _CoverBig.Rect.Z); var vidRect = new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _CoverBig.Rect.Z);
var vidRectBounds = new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f); var vidRectBounds = new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f);
CBase.Drawing.DrawTexture(_Vidtex, vidRect, _Vidtex.Color, vidRectBounds); CBase.Drawing.DrawTexture(vidtex, vidRect, vidtex.Color, vidRectBounds);
CBase.Drawing.DrawTextureReflection(_Vidtex, vidRect, _Vidtex.Color, vidRectBounds, _CoverBig.ReflectionSpace, _CoverBig.ReflectionHeight); CBase.Drawing.DrawTextureReflection(vidtex, vidRect, vidtex.Color, vidRectBounds, _CoverBig.ReflectionSpace, _CoverBig.ReflectionHeight);
} }
else else
_CoverBig.Draw(1f, EAspect.Crop); _CoverBig.Draw(EAspect.Crop);
_Artist.Draw(); _Artist.Draw();
@@ -498,104 +495,30 @@ namespace VocaluxeLib.Menu.SongMenu
_MedleyTagIcon.Draw(); _MedleyTagIcon.Draw();
} }
public override int GetSelectedSong()
{
return _Locked;
}
public override bool IsMouseOverActualSelection(SMouseEvent mEvent)
{
CStatic selCov = GetSelectedSongCover();
if (selCov.Texture == null)
return false;
var rect = new SRectF(selCov.Rect.X - selCov.Rect.W * 0.2f, selCov.Rect.Y - selCov.Rect.H * 0.2f, selCov.Rect.W * 1.2f, selCov.Rect.H * 1.2f, selCov.Rect.Z);
return CHelper.IsInBounds(rect, mEvent);
}
public override CStatic GetSelectedSongCover() public override CStatic GetSelectedSongCover()
{ {
foreach (CStatic tile in _Tiles) return _Tiles.FirstOrDefault(tile => tile.Selected);
{
if (tile.Selected)
return new CStatic(tile);
}
return new CStatic(_PartyModeID);
} }
private void _SetSelectedTile(int itemNr) protected override void _EnterCategory(int categoryNr)
{ {
bool sel = _Tiles.Any(tile => tile.Selected); base._EnterCategory(categoryNr);
if (_Locked == -1 || !sel) SetSelectedSong(0);
{ _UpdateListIfRequired();
if (_PreviewId > -1)
_Locked = _PreviewId;
else
{
_Locked = 0;
_ActualSelection = 0;
_PreviewId = 0;
_UpdateList(0, true);
}
} }
foreach (CStatic tile in _Tiles) protected override void _LeaveCategory()
tile.Selected = false;
_PreviewId = itemNr;
_Locked = itemNr;
_UpdateList(true);
_PreviewId = _Locked;
_ActualSelection = _Locked;
if (_Locked - _Offset >= 0)
_Tiles[_Locked - _Offset].Selected = true;
}
public override void SetSelectedSong(int visibleSongNr)
{ {
_PlaySong(visibleSongNr); base._LeaveCategory();
base.SetSelectedSong(visibleSongNr);
if (visibleSongNr >= 0 && visibleSongNr < CBase.Songs.GetNumSongsVisible()) SetSelectedCategory(0);
_SetSelectedTile(visibleSongNr); _UpdateListIfRequired();
}
public override void SetSelectedCategory(int categoryNr)
{
base.SetSelectedCategory(categoryNr);
if (categoryNr >= 0 && categoryNr < CBase.Songs.GetNumCategories())
_SetSelectedTile(categoryNr);
}
protected override void _EnterCategory(int cat)
{
base._EnterCategory(cat);
_PreviewId = 0;
_Locked = -1;
_ActualSelection = 0;
_AfterCategoryChange();
_Locked = 0;
}
protected override void _ShowCategories()
{
base._ShowCategories();
_PreviewId = 0;
_Locked = -1;
_ActualSelection = 0;
_AfterCategoryChange();
_Locked = 0;
} }
private void _NextCategory() private void _NextCategory()
{ {
if (CBase.Songs.GetCurrentCategoryIndex() > -1) if (CBase.Songs.IsInCategory())
{ {
CBase.Songs.NextCategory(); CBase.Songs.NextCategory();
_EnterCategory(CBase.Songs.GetCurrentCategoryIndex()); _EnterCategory(CBase.Songs.GetCurrentCategoryIndex());
@@ -604,33 +527,40 @@ namespace VocaluxeLib.Menu.SongMenu
private void _PrevCategory() private void _PrevCategory()
{ {
if (CBase.Songs.GetCurrentCategoryIndex() > -1) if (CBase.Songs.IsInCategory())
{ {
CBase.Songs.PrevCategory(); CBase.Songs.PrevCategory();
_EnterCategory(CBase.Songs.GetCurrentCategoryIndex()); _EnterCategory(CBase.Songs.GetCurrentCategoryIndex());
} }
} }
private void _AfterCategoryChange() private void _UpdateListIfRequired()
{ {
foreach (CStatic tile in _Tiles) int curElements = CBase.Songs.IsInCategory() ? CBase.Songs.GetNumSongsVisible() : CBase.Songs.GetNumCategories();
tile.Selected = false; if ((_LastKnownElements == curElements) && (_LastKnownCategory == CBase.Songs.GetCurrentCategoryIndex()))
if (_ActualSelection >= 0 && _ActualSelection < _Tiles.Count)
_Tiles[_ActualSelection].Selected = true;
if ((_LastKnownNumSongs == CBase.Songs.GetNumSongsVisible()) && (_LastKnownCategory == CBase.Songs.GetCurrentCategoryIndex()))
return; return;
_LastKnownCategory = CBase.Songs.GetCurrentCategoryIndex(); _LastKnownCategory = CBase.Songs.GetCurrentCategoryIndex();
_LastKnownNumSongs = CBase.Songs.GetNumSongsVisible(); _LastKnownElements = curElements;
_UpdateList(0, true);
CBase.Songs.UpdateRandomSongList(); CBase.Songs.UpdateRandomSongList();
_UpdateList(true);
}
private int _GetOffsetForPosition(int index, int rowNum = 0)
{
return (index / _NumW) * _NumW - (_NumW * rowNum.Clamp(0, _NumH - 1, true));
} }
private void _UpdateList(bool force = false) private void _UpdateList(bool force = false)
{ {
_UpdateList((_Locked / _NumW) * _NumW - (_NumW * (_NumH - 2)), force); int offset;
if (_SelectionNr < _Offset && _SelectionNr >= 0)
offset = _GetOffsetForPosition(_SelectionNr);
else if (_SelectionNr >= _Offset + _NumW * _NumH)
offset = _GetOffsetForPosition(_SelectionNr, _NumH);
else
offset = _Offset;
_UpdateList(offset, force);
} }
private void _UpdateList(int offset, bool force = false) private void _UpdateList(int offset, bool force = false)
@@ -638,11 +568,7 @@ namespace VocaluxeLib.Menu.SongMenu
bool isInCategory = CBase.Songs.IsInCategory(); bool isInCategory = CBase.Songs.IsInCategory();
int itemCount = isInCategory ? CBase.Songs.GetNumSongsVisible() : CBase.Songs.GetNumCategories(); int itemCount = isInCategory ? CBase.Songs.GetNumSongsVisible() : CBase.Songs.GetNumCategories();
if (offset >= (itemCount / _NumW) * _NumW - (_NumW * (_NumH - 1))) offset = offset.Clamp(0, _GetOffsetForPosition(itemCount, _NumH - 1), true);
offset = (itemCount / _NumW) * _NumW - (_NumW * (_NumH - 1));
if (offset < 0)
offset = 0;
if (offset == _Offset && !force) if (offset == _Offset && !force)
return; return;
@@ -656,58 +582,13 @@ namespace VocaluxeLib.Menu.SongMenu
} }
else else
{ {
_Tiles[i].Texture = _CoverTexture; _Tiles[i].Texture = _CoverBGTexture;
_Tiles[i].Color = _Color; _Tiles[i].Color = _Color;
} }
} }
_Offset = offset; _Offset = offset;
} }
public override void SetSmallView(bool smallView)
{
base.SetSmallView(smallView);
_SmallView = smallView;
if (_SmallView)
{
_NumH = _Theme.SongMenuTileBoard.NumHsmall;
_NumW = _Theme.SongMenuTileBoard.NumWsmall;
Rect = _Theme.SongMenuTileBoard.TileRectSmall;
}
else
{
_NumH = _Theme.SongMenuTileBoard.NumH;
_NumW = _Theme.SongMenuTileBoard.NumW;
Rect = _Theme.SongMenuTileBoard.TileRect;
}
_TileW = (int)((Rect.W - _SpaceW * (_NumW - 1)) / _NumW);
_TileH = (int)((Rect.H - _SpaceH * (_NumH - 1)) / _NumH);
_CoverTexture = CBase.Theme.GetSkinTexture(_Theme.CoverBackgroundName, _PartyModeID);
_CoverBigTexture = CBase.Theme.GetSkinTexture(_Theme.CoverBigBackgroundName, _PartyModeID);
_Tiles = new List<CStatic>();
for (int i = 0; i < _NumH; i++)
{
for (int j = 0; j < _NumW; j++)
{
var rect = new SRectF(Rect.X + j * (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z);
var tile = new CStatic(_PartyModeID, _CoverTexture, Color, rect);
_Tiles.Add(tile);
}
}
_ScrollRect = new SRectF(0, 0, CBase.Settings.GetRenderW(), CBase.Settings.GetRenderH(), Rect.Z);
_UpdateList(true);
}
public override bool IsSmallView()
{
return _SmallView;
}
public override void LoadTextures() public override void LoadTextures()
{ {
base.LoadTextures(); base.LoadTextures();
+15 -19
View File
@@ -25,34 +25,30 @@ namespace VocaluxeLib.Menu.SongMenu
void OnShow(); void OnShow();
void OnHide(); void OnHide();
void HandleInput(ref SKeyEvent keyEvent, SScreenSongOptions songOptions); bool HandleInput(ref SKeyEvent keyEvent, SScreenSongOptions options);
void HandleMouse(ref SMouseEvent mouseEvent, SScreenSongOptions songOptions); bool HandleMouse(ref SMouseEvent mouseEvent, SScreenSongOptions songOptions);
void Draw(); void Draw();
int GetSelectedSong(); // The selected song is the song, where the mouse is hovering over
// The number is refering to the index in the visible songs array
int GetPreviewSongNr();
int GetSelectedSongNr();
CStatic GetSelectedSongCover(); CStatic GetSelectedSongCover();
void SetSelectedSong(int visibleSongNr); void SetSelectedSong(int visibleSongNr);
bool IsMouseOverSelectedSong(SMouseEvent mEvent);
bool IsActive(); // Same for categories
void SetActive(bool active);
bool IsMouseOverActualSelection(SMouseEvent mEvent);
int GetSelectedCategory(); int GetSelectedCategory();
void SetSelectedCategory(int categoryNr); void SetSelectedCategory(int categoryNr);
int GetActualSelection(); bool EnterSelectedCategory();
bool EnterCurrentCategory(); // The song that is currently playing (set e.g. by clicking on a song)
int GetPreviewSong();
bool IsSelected();
void SetSelected(bool selected);
bool IsVisible();
void SetVisible(bool visible);
bool IsSmallView();
void SetSmallView(bool smallView);
SRectF Rect { get; } SRectF Rect { get; }
bool Active { get; set; }
bool Selected { get; set; }
bool Visible { get; set; }
bool SmallView { get; set; }
} }
} }
+1 -1
View File
@@ -44,7 +44,7 @@ namespace VocaluxeLib.PartyModes
public struct SSelectionOptions public struct SSelectionOptions
{ {
/// <summary> /// <summary>
/// If != -1, the SongMenu should set the song selection on the provided song index (visible index) if possible /// If != -1, the SongMenu should set the song selection to the provided song index (visible index) if possible
/// </summary> /// </summary>
public int SongIndex; public int SongIndex;
+1 -12
View File
@@ -120,20 +120,9 @@ namespace VocaluxeLib.Profile
if (filename == "") if (filename == "")
filename = "1"; filename = "1";
int i = 0; FileName = CHelper.GetUniqueFileName(FilePath, filename + ".xml", false);
while (File.Exists(Path.Combine(FilePath, filename + ".xml")))
{
i++;
if (!File.Exists(Path.Combine(FilePath, filename + i + ".xml")))
filename += i;
} }
FileName = filename + ".xml";
}
if (FileName == String.Empty)
return;
XmlWriter writer; XmlWriter writer;
try try
{ {
+3
View File
@@ -458,7 +458,10 @@ namespace VocaluxeLib.Songs
if (Preview.Source == EDataSource.None) if (Preview.Source == EDataSource.None)
{ {
if (Medley.Source != EDataSource.None) if (Medley.Source != EDataSource.None)
{
Preview.StartTime = CBase.Game.GetTimeFromBeats(Medley.StartBeat, BPM); Preview.StartTime = CBase.Game.GetTimeFromBeats(Medley.StartBeat, BPM);
Preview.Source = EDataSource.Calculated;
}
} }
} }
+23 -1
View File
@@ -240,7 +240,7 @@ namespace VocaluxeLib.Songs
break; break;
case "LANGUAGE": case "LANGUAGE":
if (value.Length > 1) if (value.Length > 1)
_Song.Languages.Add(value); _Song.Languages.Add(_UnifyLanguage(value));
else else
_LogWarning("Invalid language"); _LogWarning("Invalid language");
break; break;
@@ -416,6 +416,7 @@ namespace VocaluxeLib.Songs
{ {
//PreviewStart is not set or <=0 //PreviewStart is not set or <=0
_Song.Preview.StartTime = (headerFlags & EHeaderFlags.MedleyStartBeat) != 0 ? CBase.Game.GetTimeFromBeats(_Song.Medley.StartBeat, _Song.BPM) : 0f; _Song.Preview.StartTime = (headerFlags & EHeaderFlags.MedleyStartBeat) != 0 ? CBase.Game.GetTimeFromBeats(_Song.Medley.StartBeat, _Song.BPM) : 0f;
_Song.Preview.Source = _Song.Preview.StartTime == 0 ? EDataSource.None : EDataSource.Calculated;
} }
if ((headerFlags & EHeaderFlags.MedleyStartBeat) != 0 && (headerFlags & EHeaderFlags.MedleyEndBeat) != 0) if ((headerFlags & EHeaderFlags.MedleyStartBeat) != 0 && (headerFlags & EHeaderFlags.MedleyEndBeat) != 0)
@@ -449,6 +450,27 @@ namespace VocaluxeLib.Songs
return true; return true;
} }
private static string _UnifyLanguage(string lang)
{
if (lang != "")
{
lang = Char.ToUpperInvariant(lang[0]) + lang.Substring(1).ToLowerInvariant();
switch (lang)
{
case "Englisch":
lang = "English";
break;
case "Deutsch":
lang = "German";
break;
case "Spanisch":
lang = "Spanish";
break;
}
}
return lang;
}
private enum ENoteReadMode private enum ENoteReadMode
{ {
Normal, Normal,
+9
View File
@@ -132,6 +132,15 @@ namespace VocaluxeLib
if (ctrl) if (ctrl)
Mod |= EModifier.Ctrl; Mod |= EModifier.Ctrl;
} }
/// <summary>
/// Returns true if this is about an arrow key (left, right, up down)
/// </summary>
/// <returns>True if Key is an arrow key</returns>
public bool IsArrowKey()
{
return Key == Keys.Left || Key == Keys.Right || Key == Keys.Up || Key == Keys.Down;
}
} }
public struct SMouseEvent public struct SMouseEvent
+185
View File
@@ -0,0 +1,185 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO;
using VocaluxeLib.Draw;
using VocaluxeLib.Songs;
namespace VocaluxeLib.Utils.Player
{
public class CSongPlayer : CSoundPlayer
{
private CSong _Song;
private bool _VideoEnabled;
private int _Video = -1;
private CTexture _CurrentVideoTexture;
private CFading _VideoFading;
public bool VideoEnabled
{
get { return _VideoEnabled; }
set
{
if (_VideoEnabled == value)
return;
_VideoEnabled = value;
if (_VideoEnabled)
_LoadVideo();
else if (_Video != -1)
{
CBase.Video.Close(_Video);
CBase.Drawing.RemoveTexture(ref _CurrentVideoTexture);
_Video = -1;
}
}
}
public int SongID
{
get { return _Song == null ? -1 : _Song.ID; }
}
public bool SongHasVideo
{
get { return _Song != null && File.Exists(Path.Combine(_Song.Folder,_Song.VideoFileName)); }
}
public string ArtistAndTitle
{
get
{
if (_Song == null)
return "";
if (_Song.Artist != "" && _Song.Title != "")
return _Song.Artist + " - " + _Song.Title;
return Path.GetFileNameWithoutExtension(_Song.MP3FileName);
}
}
public CTexture Cover
{
get { return _Song == null ? CBase.Cover.GetNoCover() : _Song.CoverTextureBig; }
}
public bool SongLoaded
{
get { return _StreamID != -1; }
}
public CSongPlayer(bool loop = false) : base(loop) { }
public CSongPlayer(CSong song, bool loop = false, float position = 0f, bool autoplay = false)
: base(Path.Combine(song.Folder,song.MP3FileName), loop, position, autoplay)
{
_Song = song;
_LoadVideo();
}
public CSongPlayer(string file, bool loop = false, float position = 0f, bool autoplay = false)
: base(file, loop, position, autoplay)
{
_Song = null;
}
public CTexture GetVideoTexture()
{
if (_Video == -1 || _Song == null)
return null;
float vtime;
if (CBase.Video.GetFrame(_Video, ref _CurrentVideoTexture, CBase.Sound.GetPosition(_StreamID), out vtime))
{
if (_VideoFading != null)
{
bool finished;
_CurrentVideoTexture.Color.A = _VideoFading.GetValue(out finished);
if (finished)
_VideoFading = null;
}
return _CurrentVideoTexture;
}
return null;
}
public void Load(CSong song, float position = 0f, bool autoplay = false)
{
if (song == null)
return;
Stop();
_Song = song;
base.Load(Path.Combine(song.Folder, song.MP3FileName), position, false);
_LoadVideo();
if (autoplay)
Play();
}
public void LoadFile(string file, float position = 0f, bool autoplay = false)
{
if (String.IsNullOrEmpty(file))
return;
Stop();
base.Load(file, position, autoplay);
}
public new void Play()
{
CBase.Sound.SetPosition(_StreamID, _StartPosition);
CBase.Video.Skip(_Video, _StartPosition, _Song.VideoGap);
TogglePause();
}
public new void Stop()
{
base.Stop();
_Song = null;
if (_Video != -1)
{
CBase.Video.Close(_Video);
CBase.Drawing.RemoveTexture(ref _CurrentVideoTexture);
_Video = -1;
}
}
public new void TogglePause()
{
if (IsPlaying && _Video != -1)
{
CBase.Video.Pause(_Video);
CBase.Video.Skip(_Video, CBase.Sound.GetPosition(_StreamID) + _FadeTime, _Song.VideoGap);
}
else if(_Video != -1)
{
CBase.Video.Resume(_Video);
}
base.TogglePause();
}
private void _LoadVideo()
{
if (_Song == null)
return;
string videoFilePath = Path.Combine(_Song.Folder, _Song.VideoFileName);
if (_Video != -1 || String.IsNullOrEmpty(videoFilePath))
return;
_Video = CBase.Video.Load(videoFilePath);
CBase.Video.Skip(_Video, 0f, _Song.VideoGap); //Use gap, otherwhise we will overwrite position in GetVideoTexture
_VideoFading = new CFading(0f, 1f, 3f);
if (IsPlaying)
{
CBase.Video.Skip(_Video, Position, _Song.VideoGap);
CBase.Video.Resume(_Video);
}
}
}
}
+153
View File
@@ -0,0 +1,153 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace VocaluxeLib.Utils.Player
{
public class CSoundPlayer
{
protected int _StreamID = -1;
protected float _Volume;
protected float _StartPosition;
protected float _FadeTime = CBase.Settings.GetSoundPlayerFadeTime();
public float Volume
{
set
{
_Volume = value;
_ApplyVolume();
}
get { return _Volume; }
}
public bool Loop;
public float Position
{
set {
if(_StreamID == -1)
return;
_StartPosition = value;
}
get {
if(_StreamID == -1)
return -1;
return CBase.Sound.GetPosition(_StreamID);
}
}
public float Length
{
get
{
if (_StreamID == -1)
return 0;
return CBase.Sound.GetLength(_StreamID);
}
}
public bool RepeatSong;
public bool IsPlaying { get; protected set; }
public bool IsFinished { get { return RepeatSong ? false : CBase.Sound.IsFinished(_StreamID); } }
public CSoundPlayer(bool loop = false)
{
Loop = loop;
}
public CSoundPlayer(string file, bool loop = false, float position = 0f, bool autoplay = false)
{
_StreamID = CBase.Sound.Load(file, false, true);
if(position > 0f)
Position = position;
Loop = loop;
if (autoplay)
Play();
}
public void Load(string file, float position = 0f, bool autoplay = false)
{
if (IsPlaying)
Stop();
_StreamID = CBase.Sound.Load(file, false, true);
if (position > 0f)
Position = position;
if (autoplay)
Play();
}
public void Play()
{
if (_StreamID == -1 || IsPlaying)
return;
CBase.Sound.SetPosition(_StreamID, _StartPosition);
CBase.Sound.SetStreamVolume(_StreamID, 0f);
CBase.Sound.Fade(_StreamID, Volume, _FadeTime);
CBase.Sound.Play(_StreamID);
IsPlaying = true;
}
public void TogglePause()
{
if (_StreamID == -1)
return;
if(IsPlaying)
CBase.Sound.Fade(_StreamID, 0f, _FadeTime, EStreamAction.Pause);
else
{
CBase.Sound.Fade(_StreamID, Volume, _FadeTime);
CBase.Sound.Play(_StreamID);
}
IsPlaying = !IsPlaying;
}
public void Stop()
{
if (_StreamID == -1 || !IsPlaying)
return;
CBase.Sound.Fade(_StreamID, 0f, _FadeTime, EStreamAction.Close);
_StreamID = -1;
IsPlaying = false;
}
public void Update()
{
if (_StreamID == -1 || !IsPlaying)
return;
float timeToPlay;
float len = CBase.Sound.GetLength(_StreamID);
timeToPlay = (len > 0f) ? len - CBase.Sound.GetPosition(_StreamID) : _FadeTime + 1f;
bool finished = CBase.Sound.IsFinished(_StreamID);
if (timeToPlay <= _FadeTime || finished)
{
if (RepeatSong)
{
//Set to false for restarting
IsPlaying = false;
Play();
}
else
Stop();
}
}
private void _ApplyVolume()
{
if (_StreamID == -1)
return;
CBase.Sound.SetStreamVolume(_StreamID, Volume);
}
}
}
+2
View File
@@ -135,6 +135,8 @@
<Compile Include="PartyModes\IPartyMode.cs" /> <Compile Include="PartyModes\IPartyMode.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Utils\CWavFile.cs" /> <Compile Include="Utils\CWavFile.cs" />
<Compile Include="Utils\Player\CSongPlayer.cs" />
<Compile Include="Utils\Player\CSoundPlayer.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
+3 -2
View File
@@ -60,9 +60,10 @@ namespace WebserverInitalConfig
HttpApi.ReserveURL(networkString, "D:(A;;GX;;;S-1-1-0)"); HttpApi.ReserveURL(networkString, "D:(A;;GX;;;S-1-1-0)");
} }
public void ReserveUrl() public void ReserveUrl(bool secure)
{ {
_ReserveUrl("https://+:" + _Port + "/"); string http = secure ? "https" : "http";
_ReserveUrl(http + "://+:" + _Port + "/");
} }
private void _BindCert(X509Certificate cert) private void _BindCert(X509Certificate cert)
+112 -36
View File
@@ -25,6 +25,7 @@ using System.Security.Cryptography.X509Certificates;
namespace WebserverInitalConfig namespace WebserverInitalConfig
{ {
// ReSharper disable InconsistentNaming
static class HttpApi static class HttpApi
{ {
private static readonly HTTPAPI_VERSION HttpApiVersion = new HTTPAPI_VERSION(1, 0); private static readonly HTTPAPI_VERSION HttpApiVersion = new HTTPAPI_VERSION(1, 0);
@@ -144,6 +145,14 @@ namespace WebserverInitalConfig
public HTTP_SERVICE_CONFIG_URLACL_PARAM ParamDesc; public HTTP_SERVICE_CONFIG_URLACL_PARAM ParamDesc;
} }
[StructLayout(LayoutKind.Sequential)]
private struct HTTP_SERVICE_CONFIG_URLACL_QUERY
{
public HTTP_SERVICE_CONFIG_QUERY_TYPE QueryDesc;
public HTTP_SERVICE_CONFIG_URLACL_KEY KeyDesc;
public uint dwToken;
}
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
public struct HTTP_SERVICE_CONFIG_URLACL_KEY public struct HTTP_SERVICE_CONFIG_URLACL_KEY
{ {
@@ -227,7 +236,7 @@ namespace WebserverInitalConfig
if (retVal == ERROR_FILE_NOT_FOUND) if (retVal == ERROR_FILE_NOT_FOUND)
return; return;
if (ERROR_INSUFFICIENT_BUFFER == retVal) // ERROR_INSUFFICIENT_BUFFER = 122 if (ERROR_INSUFFICIENT_BUFFER == retVal)
{ {
pOutputConfigInfo = Marshal.AllocCoTaskMem(returnLength); pOutputConfigInfo = Marshal.AllocCoTaskMem(returnLength);
@@ -431,7 +440,7 @@ namespace WebserverInitalConfig
IntPtr.Zero); IntPtr.Zero);
if (ERROR_NO_MORE_ITEMS == retVal) if (ERROR_NO_MORE_ITEMS == retVal)
break; break;
if (ERROR_INSUFFICIENT_BUFFER == retVal) // ERROR_INSUFFICIENT_BUFFER = 122 if (ERROR_INSUFFICIENT_BUFFER == retVal)
{ {
pOutputConfigInfo = Marshal.AllocCoTaskMem(returnLength); pOutputConfigInfo = Marshal.AllocCoTaskMem(returnLength);
@@ -485,6 +494,101 @@ namespace WebserverInitalConfig
return result.ToArray(); return result.ToArray();
} }
private static HTTP_SERVICE_CONFIG_URLACL_SET QueryReservation(string networkURL)
{
if (String.IsNullOrEmpty(networkURL))
throw new ArgumentNullException("networkURL");
HTTP_SERVICE_CONFIG_URLACL_SET res = new HTTP_SERVICE_CONFIG_URLACL_SET();
res.KeyDesc = new HTTP_SERVICE_CONFIG_URLACL_KEY("");
CallHttpApi(
delegate
{
HTTP_SERVICE_CONFIG_URLACL_QUERY inputquery = new HTTP_SERVICE_CONFIG_URLACL_QUERY
{
QueryDesc = HTTP_SERVICE_CONFIG_QUERY_TYPE.HttpServiceConfigQueryExact,
KeyDesc = new HTTP_SERVICE_CONFIG_URLACL_KEY(networkURL)
};
IntPtr pInputQuery = Marshal.AllocCoTaskMem(Marshal.SizeOf(typeof(HTTP_SERVICE_CONFIG_URLACL_QUERY)));
Marshal.StructureToPtr(inputquery, pInputQuery, false);
IntPtr pOutputConfigInfo = IntPtr.Zero;
int returnLength = 0;
try
{
uint retVal = HttpQueryServiceConfiguration(IntPtr.Zero,
HTTP_SERVICE_CONFIG_ID.HttpServiceConfigUrlAclInfo,
pInputQuery,
Marshal.SizeOf(inputquery),
pOutputConfigInfo,
returnLength,
out returnLength,
IntPtr.Zero);
if (ERROR_INSUFFICIENT_BUFFER == retVal)
{
pOutputConfigInfo = Marshal.AllocCoTaskMem(returnLength);
retVal = HttpQueryServiceConfiguration(IntPtr.Zero,
HTTP_SERVICE_CONFIG_ID.HttpServiceConfigUrlAclInfo,
pInputQuery,
Marshal.SizeOf(inputquery),
pOutputConfigInfo,
returnLength,
out returnLength,
IntPtr.Zero);
if (ERROR_FILE_NOT_FOUND == retVal)
return;
ThrowWin32ExceptionIfError(retVal);
res = (HTTP_SERVICE_CONFIG_URLACL_SET)Marshal.PtrToStructure(pOutputConfigInfo, typeof(HTTP_SERVICE_CONFIG_URLACL_SET));
}
else if (ERROR_FILE_NOT_FOUND == retVal)
return;
else
ThrowWin32ExceptionIfError(retVal);
}
finally
{
Marshal.FreeCoTaskMem(pInputQuery);
if (pOutputConfigInfo != IntPtr.Zero)
Marshal.FreeCoTaskMem(pOutputConfigInfo);
}
}
);
return res;
}
public static uint DeleteReservation(string networkURL)
{
uint retVal = NOERROR;
if (String.IsNullOrEmpty(networkURL))
throw new ArgumentNullException("networkURL");
HTTP_SERVICE_CONFIG_URLACL_SET oldReservation = QueryReservation(networkURL);
if (oldReservation.KeyDesc.pUrlPrefix == "" && networkURL.Contains("+"))
{
networkURL = networkURL.Replace('+', '*');
oldReservation = QueryReservation(networkURL);
}
if (oldReservation.KeyDesc.pUrlPrefix == "")
return ERROR_FILE_NOT_FOUND;
CallHttpApi(
delegate
{
IntPtr pInputConfigInfo = Marshal.AllocCoTaskMem(Marshal.SizeOf(typeof(HTTP_SERVICE_CONFIG_URLACL_SET)));
Marshal.StructureToPtr(oldReservation, pInputConfigInfo, false);
try
{
retVal = HttpDeleteServiceConfiguration(IntPtr.Zero,
HTTP_SERVICE_CONFIG_ID.HttpServiceConfigUrlAclInfo,
pInputConfigInfo,
Marshal.SizeOf(oldReservation),
IntPtr.Zero);
}
finally
{
Marshal.FreeCoTaskMem(pInputConfigInfo);
}
});
return retVal;
}
public static void ReserveURL(string networkURL, string securityDescriptor) public static void ReserveURL(string networkURL, string securityDescriptor)
{ {
if (String.IsNullOrEmpty(networkURL)) if (String.IsNullOrEmpty(networkURL))
@@ -495,7 +599,7 @@ namespace WebserverInitalConfig
CallHttpApi( CallHttpApi(
delegate delegate
{ {
uint retVal = (uint)NOERROR; // NOERROR = 0 uint retVal;
HTTP_SERVICE_CONFIG_URLACL_KEY keyDesc = new HTTP_SERVICE_CONFIG_URLACL_KEY(networkURL); HTTP_SERVICE_CONFIG_URLACL_KEY keyDesc = new HTTP_SERVICE_CONFIG_URLACL_KEY(networkURL);
HTTP_SERVICE_CONFIG_URLACL_PARAM paramDesc = new HTTP_SERVICE_CONFIG_URLACL_PARAM(securityDescriptor); HTTP_SERVICE_CONFIG_URLACL_PARAM paramDesc = new HTTP_SERVICE_CONFIG_URLACL_PARAM(securityDescriptor);
@@ -514,41 +618,15 @@ namespace WebserverInitalConfig
Marshal.SizeOf(inputConfigInfoSet), Marshal.SizeOf(inputConfigInfoSet),
IntPtr.Zero); IntPtr.Zero);
if (ERROR_ALREADY_EXISTS == retVal) // ERROR_ALREADY_EXISTS = 183 if (ERROR_ALREADY_EXISTS == retVal)
{ {
retVal = HttpDeleteServiceConfiguration(IntPtr.Zero, retVal = DeleteReservation(networkURL);
HTTP_SERVICE_CONFIG_ID.HttpServiceConfigUrlAclInfo, if (ERROR_FILE_NOT_FOUND == retVal)
pInputConfigInfo,
Marshal.SizeOf(inputConfigInfoSet),
IntPtr.Zero);
if (NOERROR == retVal)
{
retVal = HttpSetServiceConfiguration(IntPtr.Zero,
HTTP_SERVICE_CONFIG_ID.HttpServiceConfigUrlAclInfo,
pInputConfigInfo,
Marshal.SizeOf(inputConfigInfoSet),
IntPtr.Zero);
}
else if (ERROR_FILE_NOT_FOUND == retVal) // ERROR_FILE_NOT_FOUND = 2
{ {
string networkURLOld = networkURL.Contains("https") ? networkURL.Replace("https", "http") : string networkURLOld = networkURL.Contains("https") ? networkURL.Replace("https", "http") :
networkURL.Replace("http", "https"); networkURL.Replace("http", "https");
HTTP_SERVICE_CONFIG_URLACL_KEY keyDescOld = new HTTP_SERVICE_CONFIG_URLACL_KEY(networkURLOld); retVal = DeleteReservation(networkURLOld);
HTTP_SERVICE_CONFIG_URLACL_PARAM paramDescOld = new HTTP_SERVICE_CONFIG_URLACL_PARAM(securityDescriptor); }
HTTP_SERVICE_CONFIG_URLACL_SET inputConfigInfoSetOld = new HTTP_SERVICE_CONFIG_URLACL_SET();
inputConfigInfoSetOld.KeyDesc = keyDescOld;
inputConfigInfoSetOld.ParamDesc = paramDescOld;
IntPtr pInputConfigInfoOld = Marshal.AllocCoTaskMem(Marshal.SizeOf(typeof(HTTP_SERVICE_CONFIG_URLACL_SET)));
Marshal.StructureToPtr(inputConfigInfoSetOld, pInputConfigInfoOld, false);
retVal = HttpDeleteServiceConfiguration(IntPtr.Zero,
HTTP_SERVICE_CONFIG_ID.HttpServiceConfigUrlAclInfo,
pInputConfigInfoOld,
Marshal.SizeOf(inputConfigInfoSetOld),
IntPtr.Zero);
if (NOERROR == retVal) if (NOERROR == retVal)
{ {
@@ -560,11 +638,9 @@ namespace WebserverInitalConfig
} }
} }
} }
}
finally finally
{ {
Marshal.FreeCoTaskMem(pInputConfigInfo); Marshal.FreeCoTaskMem(pInputConfigInfo);
HttpTerminate(HTTP_INITIALIZE_CONFIG, IntPtr.Zero);
} }
if (NOERROR != retVal) if (NOERROR != retVal)
ThrowWin32ExceptionIfError(retVal); ThrowWin32ExceptionIfError(retVal);
+24 -13
View File
@@ -30,34 +30,38 @@ namespace WebserverInitalConfig
private static void Main(string[] args) private static void Main(string[] args)
// ReSharper restore InconsistentNaming // ReSharper restore InconsistentNaming
{ {
int result = 0;
try try
{ {
int port; int port;
if (args.Length < 2 || !int.TryParse(args[0], out port)) if (args.Length < 3 || !int.TryParse(args[1], out port))
{ {
Console.WriteLine("Usage: VocaluxeServerConfig port isHttps"); Console.WriteLine("Usage: VocaluxeServerConfig exeName port isHttps [reserve]");
Environment.Exit(-1); result = -1;
} }
else else
{ {
CConfigHttpApi config = new CConfigHttpApi("Vocaluxe", Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Vocaluxe.exe"), "0.0.0.0", port, true); String exeName = args[0];
bool isSecure = (args[2].ToLower() == "true");
bool doReserve = (args.Length >= 4 && args[3].ToLower() == "true");
CConfigHttpApi config = new CConfigHttpApi(exeName, Path.Combine(AppDomain.CurrentDomain.BaseDirectory, exeName), "0.0.0.0", port, true);
try try
{ {
config.AddFirewallRule(); config.AddFirewallRule();
if (args[1].ToLower() == "true") if (isSecure)
config.CreateAndAddCert(Dns.GetHostName()); config.CreateAndAddCert(Dns.GetHostName());
if ((args.Length >= 3 && args[2] == "reserve") || CConfigHttpApi.IsAdministrator()) if (doReserve || CConfigHttpApi.IsAdministrator())
config.ReserveUrl(); config.ReserveUrl(isSecure);
} }
catch (AuthenticationException) catch (AuthenticationException)
{ {
ProcessStartInfo proc = new ProcessStartInfo ProcessStartInfo proc = new ProcessStartInfo
{ {
UseShellExecute = true, UseShellExecute = true,
WorkingDirectory = Environment.CurrentDirectory, WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory,
FileName = Process.GetCurrentProcess().MainModule.FileName, FileName = AppDomain.CurrentDomain.FriendlyName,
Arguments = args[0] + " " + args[1], Arguments = String.Join(" ", args),
Verb = "runas", Verb = "runas",
CreateNoWindow = true, CreateNoWindow = true,
WindowStyle = ProcessWindowStyle.Hidden, WindowStyle = ProcessWindowStyle.Hidden,
@@ -65,21 +69,28 @@ namespace WebserverInitalConfig
try try
{ {
Process.Start(proc); using (Process p = Process.Start(proc))
{
p.WaitForExit();
result = p.ExitCode;
p.Close();
}
} }
catch catch
{ {
// The user refused the elevation. // The user refused the elevation.
// Do nothing and return directly ... // Do nothing and return directly ...
Environment.Exit(-1); result = -3;
} }
} }
} }
} }
catch (Exception e) catch (Exception e)
{ {
MessageBox.Show("Error while installing server: " + e.Message); MessageBox.Show("Error while installing server: " + e.Message + "\r\n\r\nIn " + e.TargetSite + "\r\nBacktrace: " + e.StackTrace);
result = -4;
} }
Environment.Exit(result);
} }
} }
} }