Changed name of CInput to CController

Added message for missing mic in partymode
Removed pointless input entry for record devices
This commit is contained in:
Flamefire committed 2013-04-29 16:14:24 +02:00
1 parent 69c36362f5
commit 2967a01cb8
30 files changed
+232 -346

No files matched your search

+5 -5
View File
@@ -320,7 +320,7 @@ namespace Vocaluxe.Base
CVideo.Update();
CSound.Update();
CBackgroundMusic.Update();
CInput.Update();
CController.Update();
if (CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_DYNAMIC && _CurrentScreen != EScreens.ScreenSing)
CSongs.LoadCover();
@@ -512,7 +512,7 @@ namespace Vocaluxe.Base
bool resume = true;
bool eventsAvailable;
bool inputEventsAvailable = CInput.PollKeyEvent(ref inputKeyEvent);
bool inputEventsAvailable = CController.PollKeyEvent(ref inputKeyEvent);
while ((eventsAvailable = keys.PollEvent(ref keyEvent)) || inputEventsAvailable)
{
@@ -617,10 +617,10 @@ namespace Vocaluxe.Base
}
if (!eventsAvailable)
inputEventsAvailable = CInput.PollKeyEvent(ref inputKeyEvent);
inputEventsAvailable = CController.PollKeyEvent(ref inputKeyEvent);
}
inputEventsAvailable = CInput.PollMouseEvent(ref inputMouseEvent);
inputEventsAvailable = CController.PollMouseEvent(ref inputMouseEvent);
while ((eventsAvailable = mouse.PollEvent(ref mouseEvent)) || inputEventsAvailable)
{
@@ -678,7 +678,7 @@ namespace Vocaluxe.Base
resume &= _Screens[(int)_CurrentScreen].HandleMouse(mouseEvent);
if (!eventsAvailable)
inputEventsAvailable = CInput.PollMouseEvent(ref inputMouseEvent);
inputEventsAvailable = CController.PollMouseEvent(ref inputMouseEvent);
}
return resume;
}