Merge pull request #113 from flokuep/develop

some fixes
This commit is contained in:
Stephan Sundermann committed 2014-11-23 22:23:08 +01:00
commit f1645d22a2
4 files changed
+7 -7

No files matched your search

@@ -159,7 +159,7 @@
</Static> </Static>
<Static Name="StaticWarningMics"> <Static Name="StaticWarningMics">
<Skin/> <Skin/>
<Color Name="StaticWarningColor" /> <Color Name="Invisible" />
<Rect> <Rect>
<X>145</X> <X>145</X>
<Y>663</Y> <Y>663</Y>
@@ -170,7 +170,7 @@
</Static> </Static>
<Static Name="StaticWarningProfiles"> <Static Name="StaticWarningProfiles">
<Skin/> <Skin/>
<Color Name="StaticWarningColor" /> <Color Name="Invisible" />
<Rect> <Rect>
<X>145</X> <X>145</X>
<Y>715</Y> <Y>715</Y>
@@ -814,4 +814,4 @@
<Playlists /> <Playlists />
<ParticleEffects /> <ParticleEffects />
<ScreenSettings /> <ScreenSettings />
</Screen> </Screen>
@@ -82,7 +82,7 @@
</Static> </Static>
<Static Name="StaticWarning"> <Static Name="StaticWarning">
<Skin/> <Skin/>
<Color Name="StaticWarningColor" /> <Color Name="Invisible" />
<Rect> <Rect>
<X>145</X> <X>145</X>
<Y>530</Y> <Y>530</Y>
@@ -519,4 +519,4 @@
<Playlists /> <Playlists />
<ParticleEffects /> <ParticleEffects />
<ScreenSettings /> <ScreenSettings />
</Screen> </Screen>
+1 -1
View File
@@ -355,7 +355,7 @@ namespace Vocaluxe.Screens
if (_CheckMicConfig()) if (_CheckMicConfig())
{ {
for (int p = 0; p < CSettings.MaxNumPlayer; p++) for (int p = 0; p < CConfig.Config.Record.MicConfig.Length; p++)
CConfig.Config.Record.MicConfig[p].Channel = 0; CConfig.Config.Record.MicConfig[p].Channel = 0;
foreach (CRecordDevice device in _Devices) foreach (CRecordDevice device in _Devices)
@@ -480,7 +480,7 @@ namespace VocaluxeLib.Menu.SongMenu
{ {
foreach (CStatic tile in _Tiles) foreach (CStatic tile in _Tiles)
{ {
if (tile.Selected && Selected) if (tile.Selected)
tile.Draw(EAspect.Crop, SelectedTileZoomFactor, -0.1f); tile.Draw(EAspect.Crop, SelectedTileZoomFactor, -0.1f);
else else
{ {