Encapsulated CMain Classes

This commit is contained in:
Flamefire committed 2013-04-23 22:23:12 +02:00
1 parent f53e08607b
commit 7663b84f71
10 files changed
+81 -70

No files matched your search

+11 -11
View File
@@ -106,7 +106,7 @@ namespace Vocaluxe.Base
get { return File.Exists(_CurrentPlaylistElement.VideoFilePath); } get { return File.Exists(_CurrentPlaylistElement.VideoFilePath); }
} }
public static bool Playing { get; private set; } public static bool IsPlaying { get; private set; }
public static string ArtistAndTitle public static string ArtistAndTitle
{ {
@@ -138,12 +138,12 @@ namespace Vocaluxe.Base
if (CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON) if (CConfig.VideoBackgrounds == EOffOn.TR_CONFIG_ON)
_VideoEnabled = true; _VideoEnabled = true;
Playing = false; IsPlaying = false;
} }
public static void Play() public static void Play()
{ {
if (Playing) if (IsPlaying)
return; return;
if (CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON) if (CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON)
@@ -156,7 +156,7 @@ namespace Vocaluxe.Base
CSound.Play(_CurrentMusicStream); CSound.Play(_CurrentMusicStream);
if (_VideoEnabled && _Video != -1) if (_VideoEnabled && _Video != -1)
CVideo.VdResume(_Video); CVideo.VdResume(_Video);
Playing = true; IsPlaying = true;
} }
else else
Next(); Next();
@@ -168,7 +168,7 @@ namespace Vocaluxe.Base
public static void Stop() public static void Stop()
{ {
if (!Playing) if (!IsPlaying)
return; return;
if (_VideoEnabled && _Video != -1) if (_VideoEnabled && _Video != -1)
@@ -181,12 +181,12 @@ namespace Vocaluxe.Base
_CurrentMusicStream = -1; _CurrentMusicStream = -1;
_CurrentPlaylistElement = new CPlaylistElement(); _CurrentPlaylistElement = new CPlaylistElement();
Playing = false; IsPlaying = false;
} }
public static void Pause() public static void Pause()
{ {
if (!Playing) if (!IsPlaying)
return; return;
if (_VideoEnabled && _Video != -1) if (_VideoEnabled && _Video != -1)
@@ -195,7 +195,7 @@ namespace Vocaluxe.Base
CVideo.VdSkip(_Video, CSound.GetPosition(_CurrentMusicStream) + CSettings.BackgroundMusicFadeTime, _CurrentPlaylistElement.VideoGap); CVideo.VdSkip(_Video, CSound.GetPosition(_CurrentMusicStream) + CSettings.BackgroundMusicFadeTime, _CurrentPlaylistElement.VideoGap);
} }
CSound.FadeAndPause(_CurrentMusicStream, 0f, CSettings.BackgroundMusicFadeTime); CSound.FadeAndPause(_CurrentMusicStream, 0f, CSettings.BackgroundMusicFadeTime);
Playing = false; IsPlaying = false;
} }
public static void Update() public static void Update()
@@ -209,7 +209,7 @@ namespace Vocaluxe.Base
timeToPlay = _CurrentPlaylistElement.Finish - CSound.GetPosition(_CurrentMusicStream); timeToPlay = _CurrentPlaylistElement.Finish - CSound.GetPosition(_CurrentMusicStream);
bool finished = CSound.IsFinished(_CurrentMusicStream); bool finished = CSound.IsFinished(_CurrentMusicStream);
if (Playing && (timeToPlay <= CSettings.BackgroundMusicFadeTime || finished)) if (IsPlaying && (timeToPlay <= CSettings.BackgroundMusicFadeTime || finished))
{ {
if (_RepeatSong) if (_RepeatSong)
{ {
@@ -355,7 +355,7 @@ namespace Vocaluxe.Base
_NotPlayedFileNames.AddRange(_BGMusicFileNames); _NotPlayedFileNames.AddRange(_BGMusicFileNames);
} }
if (Playing && !_IsBackgroundFile(_CurrentPlaylistElement) || _AllFileNames.Count == 0) if (IsPlaying && !_IsBackgroundFile(_CurrentPlaylistElement) || _AllFileNames.Count == 0)
Next(); Next();
_OwnMusicAdded = false; _OwnMusicAdded = false;
@@ -380,7 +380,7 @@ namespace Vocaluxe.Base
AddOwnMusic(); AddOwnMusic();
_BackgroundMusicAdded = false; _BackgroundMusicAdded = false;
if (Playing && _IsBackgroundFile(_CurrentPlaylistElement) || _AllFileNames.Count == 0) if (IsPlaying && _IsBackgroundFile(_CurrentPlaylistElement) || _AllFileNames.Count == 0)
Next(); Next();
} }
} }
+28 -2
View File
@@ -77,7 +77,7 @@ namespace Vocaluxe.Base
public static ERecordLib RecordLib = ERecordLib.PortAudio; public static ERecordLib RecordLib = ERecordLib.PortAudio;
public static EBufferSize AudioBufferSize = EBufferSize.B2048; public static EBufferSize AudioBufferSize = EBufferSize.B2048;
public static int AudioLatency; public static int AudioLatency;
public static int BackgroundMusicVolume = 30; private static int _BackgroundMusicVolume = 30;
public static EOffOn BackgroundMusic = EOffOn.TR_CONFIG_ON; public static EOffOn BackgroundMusic = EOffOn.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;
@@ -118,6 +118,19 @@ namespace Vocaluxe.Base
//Variables to save old values for commandline-parameters //Variables to save old values for commandline-parameters
private static readonly List<string> _SongFolderOld = new List<string>(); private static readonly List<string> _SongFolderOld = new List<string>();
public static int BackgroundMusicVolume
{
get { return _BackgroundMusicVolume; }
set {
if (value < 0)
_BackgroundMusicVolume = 0;
else if (value > 100)
_BackgroundMusicVolume = 100;
else
_BackgroundMusicVolume = value;
SaveConfig();
}
}
public static void Init() public static void Init()
{ {
@@ -180,7 +193,7 @@ namespace Vocaluxe.Base
xmlReader.TryGetIntValueRange("//root/Sound/AudioLatency", ref AudioLatency, -500, 500); xmlReader.TryGetIntValueRange("//root/Sound/AudioLatency", ref AudioLatency, -500, 500);
xmlReader.TryGetEnumValue("//root/Sound/BackgroundMusic", ref BackgroundMusic); xmlReader.TryGetEnumValue("//root/Sound/BackgroundMusic", ref BackgroundMusic);
xmlReader.TryGetIntValueRange("//root/Sound/BackgroundMusicVolume", ref BackgroundMusicVolume); xmlReader.TryGetIntValueRange("//root/Sound/BackgroundMusicVolume", ref _BackgroundMusicVolume);
xmlReader.TryGetEnumValue("//root/Sound/BackgroundMusicSource", ref BackgroundMusicSource); xmlReader.TryGetEnumValue("//root/Sound/BackgroundMusicSource", ref BackgroundMusicSource);
xmlReader.TryGetEnumValue("//root/Sound/BackgroundMusicUseStart", ref BackgroundMusicUseStart); xmlReader.TryGetEnumValue("//root/Sound/BackgroundMusicUseStart", ref BackgroundMusicUseStart);
xmlReader.TryGetIntValueRange("//root/Sound/PreviewMusicVolume", ref PreviewMusicVolume); xmlReader.TryGetIntValueRange("//root/Sound/PreviewMusicVolume", ref PreviewMusicVolume);
@@ -591,6 +604,19 @@ namespace Vocaluxe.Base
return false; return false;
} }
public static int GetMaxNumMics()
{
int max = 0;
for (int i = 0; i < CSettings.MaxNumPlayer; i++)
{
if (IsMicConfig(i + 1))
max = i + 1;
else
break;
}
return max;
}
/// <summary> /// <summary>
/// Try to assign automatically player 1 and 2 to usb-mics. /// Try to assign automatically player 1 and 2 to usb-mics.
/// </summary> /// </summary>
+7 -7
View File
@@ -411,7 +411,7 @@ namespace Vocaluxe.Base
GC.Collect(); GC.Collect();
_CurrentScreen = _NextScreen; _CurrentScreen = _NextScreen;
_NextScreen = EScreens.ScreenNull; _NextScreen = EScreens.ScreenNull;
if (CBackgroundMusic.Playing) if (CBackgroundMusic.IsPlaying)
CBackgroundMusic.Play(); CBackgroundMusic.Play();
_Screens[(int)_CurrentScreen].OnShowFinish(); _Screens[(int)_CurrentScreen].OnShowFinish();
_Screens[(int)_CurrentScreen].ProcessMouseMove(_Cursor.X, _Cursor.Y); _Screens[(int)_CurrentScreen].ProcessMouseMove(_Cursor.X, _Cursor.Y);
@@ -542,15 +542,15 @@ namespace Vocaluxe.Base
if (popupPlayerControlAllowed && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON) if (popupPlayerControlAllowed && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON)
{ {
if (keyEvent.Key == Keys.MediaNextTrack) if (keyEvent.Key == Keys.MediaNextTrack)
CMain.BackgroundMusic.Next(); CBackgroundMusic.Next();
else if (keyEvent.Key == Keys.MediaPreviousTrack) else if (keyEvent.Key == Keys.MediaPreviousTrack)
CMain.BackgroundMusic.Previous(); CBackgroundMusic.Previous();
else if (keyEvent.Key == Keys.MediaPlayPause) else if (keyEvent.Key == Keys.MediaPlayPause)
{ {
if (CMain.BackgroundMusic.IsPlaying()) if (CBackgroundMusic.IsPlaying)
CMain.BackgroundMusic.Pause(); CBackgroundMusic.Pause();
else else
CMain.BackgroundMusic.Play(); CBackgroundMusic.Play();
} }
} }
@@ -600,7 +600,7 @@ namespace Vocaluxe.Base
_VolumePopupTimer.Start(); _VolumePopupTimer.Start();
} }
CMain.BackgroundMusic.ApplyVolume(); CBackgroundMusic.ApplyVolume();
} }
if (keyEvent.ModShift && (keyEvent.Key == Keys.F1)) if (keyEvent.ModShift && (keyEvent.Key == Keys.F1))
+24 -39
View File
@@ -27,30 +27,30 @@ namespace Vocaluxe.Base
{ {
static class CMain static class CMain
{ {
public static readonly IConfig Config = new CBconfig(); private static readonly IConfig _Config = new CBconfig();
public static readonly ISettings Settings = new CBsettings(); private static readonly ISettings _Settings = new CBsettings();
public static readonly ITheme Theme = new CBtheme(); private static readonly ITheme _Theme = new CBtheme();
public static readonly IBackgroundMusic BackgroundMusic = new CBbackgroundMusic(); private static readonly IBackgroundMusic _BackgroundMusic = new CBbackgroundMusic();
public static readonly IDrawing Draw = new CBdraw(); private static readonly IDrawing _Draw = new CBdraw();
public static IGraphics Graphics = new CBGraphics(); private static readonly IGraphics _Graphics = new CBGraphics();
public static ILog Log = new CBlog(); private static readonly ILog _Log = new CBlog();
public static IFonts Fonts = new CBfonts(); private static readonly IFonts _Fonts = new CBfonts();
public static ILanguage Language = new CBlanguage(); private static readonly ILanguage _Language = new CBlanguage();
public static IGame Game = new CBGame(); private static readonly IGame _Game = new CBGame();
public static IProfiles Profiles = new CBprofiles(); private static readonly IProfiles _Profiles = new CBprofiles();
public static IRecording Record = new CBrecord(); private static readonly IRecording _Record = new CBrecord();
public static ISongs Songs = new CBsongs(); private static readonly ISongs _Songs = new CBsongs();
public static IVideo Video = new CBvideo(); private static readonly IVideo _Video = new CBvideo();
public static ISound Sound = new CBsound(); private static readonly ISound _Sound = new CBsound();
public static ICover Cover = new CBcover(); private static readonly ICover _Cover = new CBcover();
public static IDataBase DataBase = new CBdataBase(); private static readonly IDataBase _DataBase = new CBdataBase();
public static IInputs Input = new CBinputs(); private static readonly IInputs _Input = new CBinputs();
public static IPlaylist Playlist = new CBplaylist(); private static readonly IPlaylist _Playlist = new CBplaylist();
public static void Init() public static void Init()
{ {
CBase.Assign(Config, Settings, Theme, Log, BackgroundMusic, Draw, Graphics, Fonts, Language, CBase.Assign(_Config, _Settings, _Theme, _Log, _BackgroundMusic, _Draw, _Graphics, _Fonts, _Language,
Game, Profiles, Record, Songs, Video, Sound, Cover, DataBase, Input, Playlist); _Game, _Profiles, _Record, _Songs, _Video, _Sound, _Cover, _DataBase, _Input, _Playlist);
} }
} }
@@ -58,14 +58,7 @@ namespace Vocaluxe.Base
{ {
public void SetBackgroundMusicVolume(int newVolume) public void SetBackgroundMusicVolume(int newVolume)
{ {
if (newVolume < 0) CConfig.BackgroundMusicVolume = newVolume;
CConfig.BackgroundMusicVolume = 0;
else if (newVolume > 100)
CConfig.BackgroundMusicVolume = 100;
else
CConfig.BackgroundMusicVolume = newVolume;
CConfig.SaveConfig();
} }
public int GetBackgroundMusicVolume() public int GetBackgroundMusicVolume()
@@ -140,15 +133,7 @@ namespace Vocaluxe.Base
public int GetMaxNumMics() public int GetMaxNumMics()
{ {
int max = 0; return CConfig.GetMaxNumMics();
for (int i = 0; i < CSettings.MaxNumPlayer; i++)
{
if (CConfig.IsMicConfig(i + 1))
max = i + 1;
else
break;
}
return max;
} }
} }
@@ -302,7 +287,7 @@ namespace Vocaluxe.Base
public bool IsPlaying() public bool IsPlaying()
{ {
return CBackgroundMusic.Playing; return CBackgroundMusic.IsPlaying;
} }
public bool SongHasVideo() public bool SongHasVideo()
+1 -1
View File
@@ -227,7 +227,7 @@ namespace Vocaluxe.Base
private static int _CompareByPlaylistName(CPlaylistFile a, CPlaylistFile b) private static int _CompareByPlaylistName(CPlaylistFile a, CPlaylistFile b)
{ {
return System.String.CompareOrdinal(a.PlaylistName, b.PlaylistName); return String.CompareOrdinal(a.PlaylistName, b.PlaylistName);
} }
private static CPlaylistFile _ConvertUSDXPlaylist(string file) private static CPlaylistFile _ConvertUSDXPlaylist(string file)
+1 -1
View File
@@ -282,7 +282,7 @@ namespace Vocaluxe.Base
private static int _CompareByPlayerName(SProfile a, SProfile b) private static int _CompareByPlayerName(SProfile a, SProfile b)
{ {
return System.String.CompareOrdinal(a.PlayerName, b.PlayerName); return String.CompareOrdinal(a.PlayerName, b.PlayerName);
} }
#region private methods #region private methods
@@ -189,8 +189,8 @@ namespace Vocaluxe.Screens
_Statics[_StaticCover].Texture = CBackgroundMusic.Cover; _Statics[_StaticCover].Texture = CBackgroundMusic.Cover;
if (CBackgroundMusic.VideoEnabled && _VideoPreview && CBackgroundMusic.SongHasVideo) if (CBackgroundMusic.VideoEnabled && _VideoPreview && CBackgroundMusic.SongHasVideo)
CDraw.DrawTexture(_Statics[_StaticCover], CBackgroundMusic.GetVideoTexture(), EAspect.Crop); CDraw.DrawTexture(_Statics[_StaticCover], CBackgroundMusic.GetVideoTexture(), EAspect.Crop);
_Buttons[_ButtonPause].Visible = CBackgroundMusic.Playing; _Buttons[_ButtonPause].Visible = CBackgroundMusic.IsPlaying;
_Buttons[_ButtonPlay].Visible = !CBackgroundMusic.Playing; _Buttons[_ButtonPlay].Visible = !CBackgroundMusic.IsPlaying;
_Texts[_TextCurrentSong].Text = CBackgroundMusic.ArtistAndTitle; _Texts[_TextCurrentSong].Text = CBackgroundMusic.ArtistAndTitle;
return base.Draw(); return base.Draw();
+2 -2
View File
@@ -141,7 +141,7 @@ namespace Vocaluxe.Screens
{ {
CBackgroundMusic.AddOwnMusic(); CBackgroundMusic.AddOwnMusic();
if (!CBackgroundMusic.Playing) if (!CBackgroundMusic.IsPlaying)
CBackgroundMusic.Next(); CBackgroundMusic.Next();
_BGMusicStartet = true; _BGMusicStartet = true;
@@ -177,7 +177,7 @@ namespace Vocaluxe.Screens
{ {
CBackgroundMusic.AddOwnMusic(); CBackgroundMusic.AddOwnMusic();
if (!CBackgroundMusic.Playing) if (!CBackgroundMusic.IsPlaying)
CBackgroundMusic.Next(); CBackgroundMusic.Next();
_BGMusicStartet = true; _BGMusicStartet = true;
+1 -1
View File
@@ -195,7 +195,7 @@ namespace Vocaluxe.Screens
if (index >= _PartyModeInfos.Count) if (index >= _PartyModeInfos.Count)
return; return;
if (CMain.Config.GetMaxNumMics() == 0) if (CConfig.GetMaxNumMics() == 0)
return; //TODO: Add message! return; //TODO: Add message!
if (_PartyModeInfos[index].Playable) if (_PartyModeInfos[index].Playable)
+4 -4
View File
@@ -100,7 +100,7 @@ namespace Vocaluxe.Screens
base.Init(); base.Init();
_ButtonsJoker.Clear(); _ButtonsJoker.Clear();
for (int i = 0; i < CMain.Settings.GetMaxNumPlayer(); i++) for (int i = 0; i < CSettings.MaxNumPlayer; i++)
_ButtonsJoker.Add("ButtonJoker" + (i + 1)); _ButtonsJoker.Add("ButtonJoker" + (i + 1));
List<string> blist = new List<string>(); List<string> blist = new List<string>();
blist.AddRange(_ButtonsJoker); blist.AddRange(_ButtonsJoker);
@@ -118,7 +118,7 @@ namespace Vocaluxe.Screens
blist.Add(_ButtonOptionsStartMedley); blist.Add(_ButtonOptionsStartMedley);
_TextsPlayer.Clear(); _TextsPlayer.Clear();
for (int i = 0; i < CMain.Settings.GetMaxNumPlayer(); i++) for (int i = 0; i < CSettings.MaxNumPlayer; i++)
_TextsPlayer.Add("TextPlayer" + (i + 1)); _TextsPlayer.Add("TextPlayer" + (i + 1));
List<string> tlist = new List<string>(); List<string> tlist = new List<string>();
tlist.AddRange(_TextsPlayer); tlist.AddRange(_TextsPlayer);
@@ -751,7 +751,7 @@ namespace Vocaluxe.Screens
if (!_SongMenus[_SongMenu].IsSmallView()) if (!_SongMenus[_SongMenu].IsSmallView())
_SongMenus[_SongMenu].SetSmallView(true); _SongMenus[_SongMenu].SetSmallView(true);
for (int i = 0; i < CMain.Settings.GetMaxNumPlayer(); i++) for (int i = 0; i < CSettings.MaxNumPlayer; i++)
{ {
if (i < _Sso.Selection.NumJokers.Length) if (i < _Sso.Selection.NumJokers.Length)
{ {
@@ -784,7 +784,7 @@ namespace Vocaluxe.Screens
if (_Sso.Selection.PartyMode && _SongMenus[_SongMenu].IsSmallView()) if (_Sso.Selection.PartyMode && _SongMenus[_SongMenu].IsSmallView())
_SongMenus[_SongMenu].SetSmallView(false); _SongMenus[_SongMenu].SetSmallView(false);
for (int i = 0; i < CMain.Settings.GetMaxNumPlayer(); i++) for (int i = 0; i < CSettings.MaxNumPlayer; i++)
{ {
_Buttons[_ButtonsJoker[i]].Visible = false; _Buttons[_ButtonsJoker[i]].Visible = false;
_Texts[_TextsPlayer[i]].Visible = false; _Texts[_TextsPlayer[i]].Visible = false;