From ed3047314b228aea95e552d3f3a961d12606e10c Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Mon, 6 May 2013 23:18:02 +0200 Subject: [PATCH] finished moving around --- .../PartyModeChallengeMedley/CPartyModeChallengeMedley.cs | 3 ++- PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs | 2 +- Vocaluxe/Base/CBackgroundMusic.cs | 4 ++-- Vocaluxe/Base/CConfig.cs | 1 + Vocaluxe/Base/CController.cs | 2 +- Vocaluxe/Base/CCover.cs | 1 + Vocaluxe/Base/CDataBase.cs | 4 ++-- Vocaluxe/Base/CDraw.cs | 1 + Vocaluxe/Base/CGame.cs | 6 +++--- Vocaluxe/Base/CGraphics.cs | 1 + Vocaluxe/Base/CLanguage.cs | 1 + Vocaluxe/Base/CMain.cs | 3 +++ Vocaluxe/Base/CParty.cs | 1 + Vocaluxe/Base/CPlaylists.cs | 3 ++- Vocaluxe/Base/CProfiles.cs | 3 ++- Vocaluxe/Base/CSettings.cs | 2 +- Vocaluxe/Base/CSongCategorizer.cs | 3 ++- Vocaluxe/Base/CSongFilter.cs | 4 ++-- Vocaluxe/Base/CSongSorter.cs | 4 ++-- Vocaluxe/Base/CSongs.cs | 2 ++ Vocaluxe/Base/CSound.cs | 2 +- Vocaluxe/Base/CTheme.cs | 1 + Vocaluxe/Base/CUtility.cs | 2 +- Vocaluxe/Base/CVideo.cs | 2 +- Vocaluxe/Base/CWebcam.cs | 2 +- Vocaluxe/Base/Font/CFont.cs | 1 + Vocaluxe/Base/Font/CFonts.cs | 1 + Vocaluxe/Base/Font/CGlyph.cs | 1 + Vocaluxe/GameModes/CGameMode.cs | 2 +- Vocaluxe/GameModes/CGameModes.cs | 4 ++-- Vocaluxe/GameModes/IGameMode.cs | 2 +- Vocaluxe/Lib/Draw/CDirect3D.cs | 1 + Vocaluxe/Lib/Draw/CDrawWinForm.cs | 1 + Vocaluxe/Lib/Draw/COpenGL.cs | 1 + Vocaluxe/Lib/Draw/IDraw.cs | 1 + Vocaluxe/Lib/Input/IController.cs | 2 +- Vocaluxe/Lib/Input/WiiMote/CWiiMote.cs | 2 +- Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs | 2 +- Vocaluxe/Lib/Playlist/CPlaylistFile.cs | 3 ++- Vocaluxe/Lib/Video/CVideoDecoder.cs | 2 +- Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs | 2 +- Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs | 2 +- Vocaluxe/Lib/Video/IVideoDecoder.cs | 2 +- Vocaluxe/Lib/Webcam/CAForgeNet.cs | 2 +- Vocaluxe/Lib/Webcam/IWebcam.cs | 2 +- Vocaluxe/Screens/CPopupScreenPlayerControl.cs | 1 + Vocaluxe/Screens/CPopupScreenVolumeControl.cs | 1 + Vocaluxe/Screens/CScreenCredits.cs | 1 + Vocaluxe/Screens/CScreenHighscore.cs | 4 +++- Vocaluxe/Screens/CScreenLoad.cs | 1 + Vocaluxe/Screens/CScreenMain.cs | 1 + Vocaluxe/Screens/CScreenNames.cs | 1 + Vocaluxe/Screens/CScreenOptions.cs | 1 + Vocaluxe/Screens/CScreenOptionsGame.cs | 1 + Vocaluxe/Screens/CScreenOptionsLyrics.cs | 1 + Vocaluxe/Screens/CScreenOptionsRecord.cs | 1 + Vocaluxe/Screens/CScreenOptionsSound.cs | 1 + Vocaluxe/Screens/CScreenOptionsTheme.cs | 1 + Vocaluxe/Screens/CScreenOptionsVideo.cs | 1 + Vocaluxe/Screens/CScreenParty.cs | 1 + Vocaluxe/Screens/CScreenProfiles.cs | 1 + Vocaluxe/Screens/CScreenScore.cs | 4 +++- Vocaluxe/Screens/CScreenSing.cs | 2 ++ Vocaluxe/Screens/CScreenSong.cs | 2 ++ Vocaluxe/Screens/CScreenTest.cs | 1 + Vocaluxe/SongQueue/CSongQueue.cs | 5 +++-- Vocaluxe/SongQueue/ISongQueue.cs | 5 +++-- VocaluxeLib/CBasic.cs | 4 +++- VocaluxeLib/CHelper.cs | 2 +- VocaluxeLib/CXMLReader.cs | 2 +- VocaluxeLib/Enums.cs | 2 +- VocaluxeLib/Game/CPoints.cs | 2 +- VocaluxeLib/Menu/CLyric.cs | 2 +- VocaluxeLib/Menu/CPlaylist.cs | 1 + VocaluxeLib/Menu/IMenu.cs | 3 +++ VocaluxeLib/Menu/SingNotes/CSingNotes.cs | 2 ++ VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs | 1 + VocaluxeLib/Songs/CCategory.cs | 3 ++- VocaluxeLib/Songs/CNotes.cs | 2 +- VocaluxeLib/Songs/CSong.cs | 3 +-- VocaluxeLib/Structs.cs | 4 ++-- 81 files changed, 113 insertions(+), 54 deletions(-) diff --git a/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs b/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs index aa743c90..eac5df8e 100644 --- a/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs +++ b/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs @@ -21,8 +21,9 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Runtime.InteropServices; +using VocaluxeLib.Game; using VocaluxeLib.Menu; -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib.Songs; [assembly: ComVisible(false)] diff --git a/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs b/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs index a7dbf8e1..93093114 100644 --- a/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs +++ b/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using System.Windows.Forms; using VocaluxeLib.Menu; -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib.Songs; namespace VocaluxeLib.PartyModes.TicTacToe { diff --git a/Vocaluxe/Base/CBackgroundMusic.cs b/Vocaluxe/Base/CBackgroundMusic.cs index bcf1f712..d52a6e97 100644 --- a/Vocaluxe/Base/CBackgroundMusic.cs +++ b/Vocaluxe/Base/CBackgroundMusic.cs @@ -23,8 +23,8 @@ using System.Diagnostics; using System.IO; using System.Linq; using Vocaluxe.Base; -using VocaluxeLib.Menu; -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib; +using VocaluxeLib.Songs; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs index baf4b93c..061664a2 100644 --- a/Vocaluxe/Base/CConfig.cs +++ b/Vocaluxe/Base/CConfig.cs @@ -28,6 +28,7 @@ using System.Windows.Forms; using System.Xml; using Vocaluxe.Lib.Sound; using Vocaluxe.Lib.Webcam; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Base diff --git a/Vocaluxe/Base/CController.cs b/Vocaluxe/Base/CController.cs index 5014eef8..2e358acd 100644 --- a/Vocaluxe/Base/CController.cs +++ b/Vocaluxe/Base/CController.cs @@ -19,7 +19,7 @@ using Vocaluxe.Lib.Input; using Vocaluxe.Lib.Input.WiiMote; -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/CCover.cs b/Vocaluxe/Base/CCover.cs index 24f80d64..30c51ef2 100644 --- a/Vocaluxe/Base/CCover.cs +++ b/Vocaluxe/Base/CCover.cs @@ -23,6 +23,7 @@ using System.IO; using System.Linq; using System.Text; using System.Xml; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Base diff --git a/Vocaluxe/Base/CDataBase.cs b/Vocaluxe/Base/CDataBase.cs index 79ae5999..ce58f110 100644 --- a/Vocaluxe/Base/CDataBase.cs +++ b/Vocaluxe/Base/CDataBase.cs @@ -35,8 +35,8 @@ using SQLiteCommand = Mono.Data.Sqlite.SqliteCommand; using SQLiteDataReader = Mono.Data.Sqlite.SqliteDataReader; #endif using Community.CsharpSqlite; -using VocaluxeLib.Menu; -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib; +using VocaluxeLib.Songs; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/CDraw.cs b/Vocaluxe/Base/CDraw.cs index 0bed36e9..cdb77d55 100644 --- a/Vocaluxe/Base/CDraw.cs +++ b/Vocaluxe/Base/CDraw.cs @@ -22,6 +22,7 @@ using System.Drawing; using System.IO; using System.Windows.Forms; using Vocaluxe.Lib.Draw; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Base diff --git a/Vocaluxe/Base/CGame.cs b/Vocaluxe/Base/CGame.cs index 58bc9c2d..c6b58e0e 100644 --- a/Vocaluxe/Base/CGame.cs +++ b/Vocaluxe/Base/CGame.cs @@ -20,9 +20,9 @@ using System; using System.Collections.Generic; using Vocaluxe.SongQueue; -using VocaluxeLib.Menu; -using VocaluxeLib.Menu.SingNotes; -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib; +using VocaluxeLib.Game; +using VocaluxeLib.Songs; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/CGraphics.cs b/Vocaluxe/Base/CGraphics.cs index a7f03f65..b08f6373 100644 --- a/Vocaluxe/Base/CGraphics.cs +++ b/Vocaluxe/Base/CGraphics.cs @@ -24,6 +24,7 @@ using System.Drawing; using System.Windows.Forms; using Vocaluxe.Base.Font; using Vocaluxe.Screens; +using VocaluxeLib; using VocaluxeLib.Menu; using VocaluxeLib.PartyModes; diff --git a/Vocaluxe/Base/CLanguage.cs b/Vocaluxe/Base/CLanguage.cs index fa48225c..7482ffba 100644 --- a/Vocaluxe/Base/CLanguage.cs +++ b/Vocaluxe/Base/CLanguage.cs @@ -23,6 +23,7 @@ using System.IO; using System.Linq; using System.Text; using System.Xml; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Base diff --git a/Vocaluxe/Base/CMain.cs b/Vocaluxe/Base/CMain.cs index 4f959225..5ba3ac82 100644 --- a/Vocaluxe/Base/CMain.cs +++ b/Vocaluxe/Base/CMain.cs @@ -22,8 +22,11 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Drawing; using Vocaluxe.Base.Font; +using VocaluxeLib; +using VocaluxeLib.Game; using VocaluxeLib.Menu; using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib.Songs; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/CParty.cs b/Vocaluxe/Base/CParty.cs index 1cbd1485..f2b87093 100644 --- a/Vocaluxe/Base/CParty.cs +++ b/Vocaluxe/Base/CParty.cs @@ -22,6 +22,7 @@ using System.CodeDom.Compiler; using System.Collections.Generic; using System.IO; using System.Reflection; +using VocaluxeLib; using VocaluxeLib.Menu; using VocaluxeLib.PartyModes; diff --git a/Vocaluxe/Base/CPlaylists.cs b/Vocaluxe/Base/CPlaylists.cs index f057b26c..8c6cb840 100644 --- a/Vocaluxe/Base/CPlaylists.cs +++ b/Vocaluxe/Base/CPlaylists.cs @@ -23,8 +23,9 @@ using System.Collections.ObjectModel; using System.IO; using System.Text; using Vocaluxe.Lib.Playlist; +using VocaluxeLib; using VocaluxeLib.Menu; -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib.Songs; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/CProfiles.cs b/Vocaluxe/Base/CProfiles.cs index 2944b0e7..30c4282e 100644 --- a/Vocaluxe/Base/CProfiles.cs +++ b/Vocaluxe/Base/CProfiles.cs @@ -22,7 +22,8 @@ using System.Collections.Generic; using System.IO; using System.Text; using System.Xml; -using VocaluxeLib.Menu; +using VocaluxeLib; +using VocaluxeLib.Game; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/CSettings.cs b/Vocaluxe/Base/CSettings.cs index 5fa38628..e762aa91 100644 --- a/Vocaluxe/Base/CSettings.cs +++ b/Vocaluxe/Base/CSettings.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Reflection; -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/CSongCategorizer.cs b/Vocaluxe/Base/CSongCategorizer.cs index db61fe26..7a43c210 100644 --- a/Vocaluxe/Base/CSongCategorizer.cs +++ b/Vocaluxe/Base/CSongCategorizer.cs @@ -20,8 +20,9 @@ using System; using System.Collections.Generic; using System.Text; -using VocaluxeLib.Menu; +using VocaluxeLib; using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib.Songs; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/CSongFilter.cs b/Vocaluxe/Base/CSongFilter.cs index 03744ab0..43777269 100644 --- a/Vocaluxe/Base/CSongFilter.cs +++ b/Vocaluxe/Base/CSongFilter.cs @@ -20,8 +20,8 @@ using System; using System.Collections.Generic; using System.Linq; -using VocaluxeLib.Menu; -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib; +using VocaluxeLib.Songs; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/CSongSorter.cs b/Vocaluxe/Base/CSongSorter.cs index 743f9506..6409d833 100644 --- a/Vocaluxe/Base/CSongSorter.cs +++ b/Vocaluxe/Base/CSongSorter.cs @@ -20,8 +20,8 @@ using System; using System.Collections.Generic; using System.Reflection; -using VocaluxeLib.Menu; -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib; +using VocaluxeLib.Songs; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/CSongs.cs b/Vocaluxe/Base/CSongs.cs index 3ce699ae..d49b5cef 100644 --- a/Vocaluxe/Base/CSongs.cs +++ b/Vocaluxe/Base/CSongs.cs @@ -22,8 +22,10 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Threading; +using VocaluxeLib; using VocaluxeLib.Menu; using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib.Songs; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/CSound.cs b/Vocaluxe/Base/CSound.cs index 1ac824a7..a4dc3e5b 100644 --- a/Vocaluxe/Base/CSound.cs +++ b/Vocaluxe/Base/CSound.cs @@ -22,7 +22,7 @@ using System.Collections.ObjectModel; using System.Diagnostics; using System.IO; using Vocaluxe.Lib.Sound; -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/CTheme.cs b/Vocaluxe/Base/CTheme.cs index 30ce2f20..cb79c832 100644 --- a/Vocaluxe/Base/CTheme.cs +++ b/Vocaluxe/Base/CTheme.cs @@ -24,6 +24,7 @@ using System.Text; using System.Windows.Forms; using System.Xml; using Vocaluxe.Base.Font; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Base diff --git a/Vocaluxe/Base/CUtility.cs b/Vocaluxe/Base/CUtility.cs index 17dfae81..27ad1db3 100644 --- a/Vocaluxe/Base/CUtility.cs +++ b/Vocaluxe/Base/CUtility.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Windows.Forms; -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/CVideo.cs b/Vocaluxe/Base/CVideo.cs index db7390fb..cd9e89f4 100644 --- a/Vocaluxe/Base/CVideo.cs +++ b/Vocaluxe/Base/CVideo.cs @@ -20,7 +20,7 @@ using System.Diagnostics; using System.Drawing; using Vocaluxe.Lib.Video; -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/CWebcam.cs b/Vocaluxe/Base/CWebcam.cs index 0a361c68..bfe48e78 100644 --- a/Vocaluxe/Base/CWebcam.cs +++ b/Vocaluxe/Base/CWebcam.cs @@ -19,7 +19,7 @@ using System.Drawing; using Vocaluxe.Lib.Webcam; -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Base { diff --git a/Vocaluxe/Base/Font/CFont.cs b/Vocaluxe/Base/Font/CFont.cs index fb4fc0ee..64023bd8 100644 --- a/Vocaluxe/Base/Font/CFont.cs +++ b/Vocaluxe/Base/Font/CFont.cs @@ -21,6 +21,7 @@ using System; using System.Collections.Generic; using System.Drawing; using System.Drawing.Text; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Base.Font diff --git a/Vocaluxe/Base/Font/CFonts.cs b/Vocaluxe/Base/Font/CFonts.cs index 21922d7a..df33720a 100644 --- a/Vocaluxe/Base/Font/CFonts.cs +++ b/Vocaluxe/Base/Font/CFonts.cs @@ -23,6 +23,7 @@ using System.IO; using System.Linq; using System.Text; using System.Xml; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Base.Font diff --git a/Vocaluxe/Base/Font/CGlyph.cs b/Vocaluxe/Base/Font/CGlyph.cs index a8b5bdc8..1c863b74 100644 --- a/Vocaluxe/Base/Font/CGlyph.cs +++ b/Vocaluxe/Base/Font/CGlyph.cs @@ -22,6 +22,7 @@ using System.Drawing; using System.Drawing.Drawing2D; using System.Drawing.Text; using System.Windows.Forms; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Base.Font diff --git a/Vocaluxe/GameModes/CGameMode.cs b/Vocaluxe/GameModes/CGameMode.cs index 31675f31..d945ca73 100644 --- a/Vocaluxe/GameModes/CGameMode.cs +++ b/Vocaluxe/GameModes/CGameMode.cs @@ -18,7 +18,7 @@ #endregion using Vocaluxe.Base; -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib.Songs; namespace Vocaluxe.GameModes { diff --git a/Vocaluxe/GameModes/CGameModes.cs b/Vocaluxe/GameModes/CGameModes.cs index 822d599e..5090ff44 100644 --- a/Vocaluxe/GameModes/CGameModes.cs +++ b/Vocaluxe/GameModes/CGameModes.cs @@ -19,8 +19,8 @@ using System.Collections.Generic; using Vocaluxe.Base; -using VocaluxeLib.Menu; -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib; +using VocaluxeLib.Songs; namespace Vocaluxe.GameModes { diff --git a/Vocaluxe/GameModes/IGameMode.cs b/Vocaluxe/GameModes/IGameMode.cs index 62277660..91504898 100644 --- a/Vocaluxe/GameModes/IGameMode.cs +++ b/Vocaluxe/GameModes/IGameMode.cs @@ -17,7 +17,7 @@ // */ #endregion -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib.Songs; namespace Vocaluxe.GameModes { diff --git a/Vocaluxe/Lib/Draw/CDirect3D.cs b/Vocaluxe/Lib/Draw/CDirect3D.cs index 37a09046..7cd083e6 100644 --- a/Vocaluxe/Lib/Draw/CDirect3D.cs +++ b/Vocaluxe/Lib/Draw/CDirect3D.cs @@ -32,6 +32,7 @@ using System.Windows.Forms; using SlimDX.Windows; using Vocaluxe.Base; using Vocaluxe.Base.Font; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Lib.Draw diff --git a/Vocaluxe/Lib/Draw/CDrawWinForm.cs b/Vocaluxe/Lib/Draw/CDrawWinForm.cs index 6032aeb6..f76de4b4 100644 --- a/Vocaluxe/Lib/Draw/CDrawWinForm.cs +++ b/Vocaluxe/Lib/Draw/CDrawWinForm.cs @@ -28,6 +28,7 @@ using System.Threading; using System.Windows.Forms; using Vocaluxe.Base; using Vocaluxe.Base.Font; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Lib.Draw diff --git a/Vocaluxe/Lib/Draw/COpenGL.cs b/Vocaluxe/Lib/Draw/COpenGL.cs index f04a87c0..0deb0595 100644 --- a/Vocaluxe/Lib/Draw/COpenGL.cs +++ b/Vocaluxe/Lib/Draw/COpenGL.cs @@ -31,6 +31,7 @@ using System.Runtime.InteropServices; using System.Windows.Forms; using Vocaluxe.Base; using Vocaluxe.Base.Font; +using VocaluxeLib; using VocaluxeLib.Menu; using BeginMode = OpenTK.Graphics.OpenGL.BeginMode; using BlendingFactorDest = OpenTK.Graphics.OpenGL.BlendingFactorDest; diff --git a/Vocaluxe/Lib/Draw/IDraw.cs b/Vocaluxe/Lib/Draw/IDraw.cs index 1230145c..8821a00b 100644 --- a/Vocaluxe/Lib/Draw/IDraw.cs +++ b/Vocaluxe/Lib/Draw/IDraw.cs @@ -19,6 +19,7 @@ using System; using System.Drawing; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Lib.Draw diff --git a/Vocaluxe/Lib/Input/IController.cs b/Vocaluxe/Lib/Input/IController.cs index f54c25bf..2a361f40 100644 --- a/Vocaluxe/Lib/Input/IController.cs +++ b/Vocaluxe/Lib/Input/IController.cs @@ -20,7 +20,7 @@ using System; using System.Diagnostics; using System.Drawing; -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Lib.Input { diff --git a/Vocaluxe/Lib/Input/WiiMote/CWiiMote.cs b/Vocaluxe/Lib/Input/WiiMote/CWiiMote.cs index 2ff404d1..6fffb49c 100644 --- a/Vocaluxe/Lib/Input/WiiMote/CWiiMote.cs +++ b/Vocaluxe/Lib/Input/WiiMote/CWiiMote.cs @@ -23,7 +23,7 @@ using System.Drawing; using System.Threading; using System.Windows.Forms; using Vocaluxe.Base; -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Lib.Input.WiiMote { diff --git a/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs b/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs index 622f7f17..b4e234c9 100644 --- a/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs +++ b/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs @@ -21,7 +21,7 @@ using System; using System.Drawing; using System.Threading; using Vocaluxe.Base; -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Lib.Input.WiiMote { diff --git a/Vocaluxe/Lib/Playlist/CPlaylistFile.cs b/Vocaluxe/Lib/Playlist/CPlaylistFile.cs index f0603d78..64c84e7a 100644 --- a/Vocaluxe/Lib/Playlist/CPlaylistFile.cs +++ b/Vocaluxe/Lib/Playlist/CPlaylistFile.cs @@ -23,8 +23,9 @@ using System.IO; using System.Text; using System.Xml; using Vocaluxe.Base; +using VocaluxeLib; using VocaluxeLib.Menu; -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib.Songs; namespace Vocaluxe.Lib.Playlist { diff --git a/Vocaluxe/Lib/Video/CVideoDecoder.cs b/Vocaluxe/Lib/Video/CVideoDecoder.cs index 53d96bef..34caba5a 100644 --- a/Vocaluxe/Lib/Video/CVideoDecoder.cs +++ b/Vocaluxe/Lib/Video/CVideoDecoder.cs @@ -19,7 +19,7 @@ using System.Collections.Generic; using System.Linq; -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Lib.Video { diff --git a/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs b/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs index 135d3129..72d38fe5 100644 --- a/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs +++ b/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs @@ -25,7 +25,7 @@ using System.Runtime.InteropServices; using System.Threading; using Vocaluxe.Base; using Vocaluxe.Lib.Video.Acinerella; -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Lib.Video { diff --git a/Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs b/Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs index ac5b15cf..9e9d0b89 100644 --- a/Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs +++ b/Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs @@ -20,7 +20,7 @@ using System; using Vocaluxe.Base; using Vocaluxe.Lib.Video.Gstreamer; -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Lib.Video { diff --git a/Vocaluxe/Lib/Video/IVideoDecoder.cs b/Vocaluxe/Lib/Video/IVideoDecoder.cs index 4dc3905a..807361c8 100644 --- a/Vocaluxe/Lib/Video/IVideoDecoder.cs +++ b/Vocaluxe/Lib/Video/IVideoDecoder.cs @@ -17,7 +17,7 @@ // */ #endregion -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Lib.Video { diff --git a/Vocaluxe/Lib/Webcam/CAForgeNet.cs b/Vocaluxe/Lib/Webcam/CAForgeNet.cs index c53b16c6..614a90c7 100644 --- a/Vocaluxe/Lib/Webcam/CAForgeNet.cs +++ b/Vocaluxe/Lib/Webcam/CAForgeNet.cs @@ -24,7 +24,7 @@ using System.Drawing; using System.Drawing.Imaging; using System.Runtime.InteropServices; using Vocaluxe.Base; -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Lib.Webcam { diff --git a/Vocaluxe/Lib/Webcam/IWebcam.cs b/Vocaluxe/Lib/Webcam/IWebcam.cs index 32804bfc..75eb3fe4 100644 --- a/Vocaluxe/Lib/Webcam/IWebcam.cs +++ b/Vocaluxe/Lib/Webcam/IWebcam.cs @@ -19,7 +19,7 @@ using System.Collections.Generic; using System.Drawing; -using VocaluxeLib.Menu; +using VocaluxeLib; namespace Vocaluxe.Lib.Webcam { diff --git a/Vocaluxe/Screens/CPopupScreenPlayerControl.cs b/Vocaluxe/Screens/CPopupScreenPlayerControl.cs index 023ee4e2..6184d583 100644 --- a/Vocaluxe/Screens/CPopupScreenPlayerControl.cs +++ b/Vocaluxe/Screens/CPopupScreenPlayerControl.cs @@ -20,6 +20,7 @@ using System; using System.Windows.Forms; using Vocaluxe.Base; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Screens diff --git a/Vocaluxe/Screens/CPopupScreenVolumeControl.cs b/Vocaluxe/Screens/CPopupScreenVolumeControl.cs index b3213950..8b75e482 100644 --- a/Vocaluxe/Screens/CPopupScreenVolumeControl.cs +++ b/Vocaluxe/Screens/CPopupScreenVolumeControl.cs @@ -18,6 +18,7 @@ #endregion using Vocaluxe.Base; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Screens diff --git a/Vocaluxe/Screens/CScreenCredits.cs b/Vocaluxe/Screens/CScreenCredits.cs index b37fdeb3..146744f0 100644 --- a/Vocaluxe/Screens/CScreenCredits.cs +++ b/Vocaluxe/Screens/CScreenCredits.cs @@ -22,6 +22,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Windows.Forms; using Vocaluxe.Base; +using VocaluxeLib; using VocaluxeLib.Menu; enum EDirection diff --git a/Vocaluxe/Screens/CScreenHighscore.cs b/Vocaluxe/Screens/CScreenHighscore.cs index 3dc5ef1e..56e70ecf 100644 --- a/Vocaluxe/Screens/CScreenHighscore.cs +++ b/Vocaluxe/Screens/CScreenHighscore.cs @@ -22,8 +22,10 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; using Vocaluxe.Base; +using VocaluxeLib; +using VocaluxeLib.Game; using VocaluxeLib.Menu; -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib.Songs; namespace Vocaluxe.Screens { diff --git a/Vocaluxe/Screens/CScreenLoad.cs b/Vocaluxe/Screens/CScreenLoad.cs index 1f25f6d1..52d519fd 100644 --- a/Vocaluxe/Screens/CScreenLoad.cs +++ b/Vocaluxe/Screens/CScreenLoad.cs @@ -21,6 +21,7 @@ using System.Diagnostics; using System.Threading; using System.Windows.Forms; using Vocaluxe.Base; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Screens diff --git a/Vocaluxe/Screens/CScreenMain.cs b/Vocaluxe/Screens/CScreenMain.cs index 977cb417..eddeda92 100644 --- a/Vocaluxe/Screens/CScreenMain.cs +++ b/Vocaluxe/Screens/CScreenMain.cs @@ -20,6 +20,7 @@ using System.Windows.Forms; using Vocaluxe.Base; using Vocaluxe.Base.Font; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Screens diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs index 99006246..0dec07a7 100644 --- a/Vocaluxe/Screens/CScreenNames.cs +++ b/Vocaluxe/Screens/CScreenNames.cs @@ -21,6 +21,7 @@ using System; using System.Collections.Generic; using System.Windows.Forms; using Vocaluxe.Base; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Screens diff --git a/Vocaluxe/Screens/CScreenOptions.cs b/Vocaluxe/Screens/CScreenOptions.cs index ece463af..b8281ca3 100644 --- a/Vocaluxe/Screens/CScreenOptions.cs +++ b/Vocaluxe/Screens/CScreenOptions.cs @@ -19,6 +19,7 @@ using System.Windows.Forms; using Vocaluxe.Base; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Screens diff --git a/Vocaluxe/Screens/CScreenOptionsGame.cs b/Vocaluxe/Screens/CScreenOptionsGame.cs index a350026a..8ba0f0ab 100644 --- a/Vocaluxe/Screens/CScreenOptionsGame.cs +++ b/Vocaluxe/Screens/CScreenOptionsGame.cs @@ -19,6 +19,7 @@ using System.Windows.Forms; using Vocaluxe.Base; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Screens diff --git a/Vocaluxe/Screens/CScreenOptionsLyrics.cs b/Vocaluxe/Screens/CScreenOptionsLyrics.cs index 029923e2..1287a9f6 100644 --- a/Vocaluxe/Screens/CScreenOptionsLyrics.cs +++ b/Vocaluxe/Screens/CScreenOptionsLyrics.cs @@ -19,6 +19,7 @@ using System.Windows.Forms; using Vocaluxe.Base; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Screens diff --git a/Vocaluxe/Screens/CScreenOptionsRecord.cs b/Vocaluxe/Screens/CScreenOptionsRecord.cs index 36e0c51e..36a7f66d 100644 --- a/Vocaluxe/Screens/CScreenOptionsRecord.cs +++ b/Vocaluxe/Screens/CScreenOptionsRecord.cs @@ -23,6 +23,7 @@ using System.Diagnostics; using System.Windows.Forms; using Vocaluxe.Base; using Vocaluxe.Lib.Sound; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Screens diff --git a/Vocaluxe/Screens/CScreenOptionsSound.cs b/Vocaluxe/Screens/CScreenOptionsSound.cs index 8d6ddfa0..ef809fbb 100644 --- a/Vocaluxe/Screens/CScreenOptionsSound.cs +++ b/Vocaluxe/Screens/CScreenOptionsSound.cs @@ -19,6 +19,7 @@ using System.Windows.Forms; using Vocaluxe.Base; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Screens diff --git a/Vocaluxe/Screens/CScreenOptionsTheme.cs b/Vocaluxe/Screens/CScreenOptionsTheme.cs index a0570294..27168bdf 100644 --- a/Vocaluxe/Screens/CScreenOptionsTheme.cs +++ b/Vocaluxe/Screens/CScreenOptionsTheme.cs @@ -20,6 +20,7 @@ using System.Windows.Forms; using Vocaluxe.Base; using Vocaluxe.Base.Font; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Screens diff --git a/Vocaluxe/Screens/CScreenOptionsVideo.cs b/Vocaluxe/Screens/CScreenOptionsVideo.cs index 3367edc2..acbd2aea 100644 --- a/Vocaluxe/Screens/CScreenOptionsVideo.cs +++ b/Vocaluxe/Screens/CScreenOptionsVideo.cs @@ -21,6 +21,7 @@ using System; using System.Windows.Forms; using Vocaluxe.Base; using Vocaluxe.Lib.Webcam; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Screens diff --git a/Vocaluxe/Screens/CScreenParty.cs b/Vocaluxe/Screens/CScreenParty.cs index 6b31fab1..8288c573 100644 --- a/Vocaluxe/Screens/CScreenParty.cs +++ b/Vocaluxe/Screens/CScreenParty.cs @@ -20,6 +20,7 @@ using System.Collections.Generic; using System.Windows.Forms; using Vocaluxe.Base; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Screens diff --git a/Vocaluxe/Screens/CScreenProfiles.cs b/Vocaluxe/Screens/CScreenProfiles.cs index b3c3740e..2ee4cbcf 100644 --- a/Vocaluxe/Screens/CScreenProfiles.cs +++ b/Vocaluxe/Screens/CScreenProfiles.cs @@ -23,6 +23,7 @@ using System.Drawing.Imaging; using System.IO; using System.Windows.Forms; using Vocaluxe.Base; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Screens diff --git a/Vocaluxe/Screens/CScreenScore.cs b/Vocaluxe/Screens/CScreenScore.cs index 57764cac..28af99ff 100644 --- a/Vocaluxe/Screens/CScreenScore.cs +++ b/Vocaluxe/Screens/CScreenScore.cs @@ -22,8 +22,10 @@ using System.Collections.Generic; using System.Diagnostics; using System.Windows.Forms; using Vocaluxe.Base; +using VocaluxeLib; +using VocaluxeLib.Game; using VocaluxeLib.Menu; -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib.Songs; namespace Vocaluxe.Screens { diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index b2c291ea..085d161c 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -26,9 +26,11 @@ using System.Linq; using System.Windows.Forms; using Vocaluxe.Base; using Vocaluxe.Base.Font; +using VocaluxeLib; using VocaluxeLib.Menu; using VocaluxeLib.Menu.SingNotes; using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib.Songs; namespace Vocaluxe.Screens { diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index e04ad980..aaeb0e6e 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/Vocaluxe/Screens/CScreenSong.cs @@ -22,9 +22,11 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Windows.Forms; using Vocaluxe.Base; +using VocaluxeLib; using VocaluxeLib.Menu; using VocaluxeLib.Menu.SongMenu; using VocaluxeLib.PartyModes; +using VocaluxeLib.Songs; namespace Vocaluxe.Screens { diff --git a/Vocaluxe/Screens/CScreenTest.cs b/Vocaluxe/Screens/CScreenTest.cs index 3fa3f2e4..e0d1aac0 100644 --- a/Vocaluxe/Screens/CScreenTest.cs +++ b/Vocaluxe/Screens/CScreenTest.cs @@ -20,6 +20,7 @@ using System; using System.Windows.Forms; using Vocaluxe.Base; +using VocaluxeLib; using VocaluxeLib.Menu; namespace Vocaluxe.Screens diff --git a/Vocaluxe/SongQueue/CSongQueue.cs b/Vocaluxe/SongQueue/CSongQueue.cs index eb32c0e5..62dbcdb5 100644 --- a/Vocaluxe/SongQueue/CSongQueue.cs +++ b/Vocaluxe/SongQueue/CSongQueue.cs @@ -20,8 +20,9 @@ using System.Collections.Generic; using Vocaluxe.Base; using Vocaluxe.GameModes; -using VocaluxeLib.Menu; -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib; +using VocaluxeLib.Game; +using VocaluxeLib.Songs; namespace Vocaluxe.SongQueue { diff --git a/Vocaluxe/SongQueue/ISongQueue.cs b/Vocaluxe/SongQueue/ISongQueue.cs index 05d48111..69f294a0 100644 --- a/Vocaluxe/SongQueue/ISongQueue.cs +++ b/Vocaluxe/SongQueue/ISongQueue.cs @@ -17,8 +17,9 @@ // */ #endregion -using VocaluxeLib.Menu; -using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib; +using VocaluxeLib.Game; +using VocaluxeLib.Songs; namespace Vocaluxe.SongQueue { diff --git a/VocaluxeLib/CBasic.cs b/VocaluxeLib/CBasic.cs index 99fe0818..5c32807e 100644 --- a/VocaluxeLib/CBasic.cs +++ b/VocaluxeLib/CBasic.cs @@ -17,7 +17,9 @@ // */ #endregion -namespace VocaluxeLib.Menu +using VocaluxeLib.Menu; + +namespace VocaluxeLib { public static class CBase { diff --git a/VocaluxeLib/CHelper.cs b/VocaluxeLib/CHelper.cs index bdf1a007..22a7fbed 100644 --- a/VocaluxeLib/CHelper.cs +++ b/VocaluxeLib/CHelper.cs @@ -24,7 +24,7 @@ using System.Globalization; using System.IO; using System.Text; -namespace VocaluxeLib.Menu +namespace VocaluxeLib { public static class CHelper { diff --git a/VocaluxeLib/CXMLReader.cs b/VocaluxeLib/CXMLReader.cs index 6173699b..5b295bcb 100644 --- a/VocaluxeLib/CXMLReader.cs +++ b/VocaluxeLib/CXMLReader.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using System.Xml.XPath; -namespace VocaluxeLib.Menu +namespace VocaluxeLib { public class CXMLReader { diff --git a/VocaluxeLib/Enums.cs b/VocaluxeLib/Enums.cs index 6f05dd61..7cf92845 100644 --- a/VocaluxeLib/Enums.cs +++ b/VocaluxeLib/Enums.cs @@ -19,7 +19,7 @@ using System; -namespace VocaluxeLib.Menu +namespace VocaluxeLib { #region Inputs diff --git a/VocaluxeLib/Game/CPoints.cs b/VocaluxeLib/Game/CPoints.cs index f6ab17fb..a0f82b90 100644 --- a/VocaluxeLib/Game/CPoints.cs +++ b/VocaluxeLib/Game/CPoints.cs @@ -19,7 +19,7 @@ using System; -namespace VocaluxeLib.Menu +namespace VocaluxeLib.Game { public class CPoints { diff --git a/VocaluxeLib/Menu/CLyric.cs b/VocaluxeLib/Menu/CLyric.cs index 2d18e6ec..547124e5 100644 --- a/VocaluxeLib/Menu/CLyric.cs +++ b/VocaluxeLib/Menu/CLyric.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using System.Drawing; using System.Xml; -using VocaluxeLib.Menu.SingNotes; +using VocaluxeLib.Songs; namespace VocaluxeLib.Menu { diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs index 29bb1943..acc1d704 100644 --- a/VocaluxeLib/Menu/CPlaylist.cs +++ b/VocaluxeLib/Menu/CPlaylist.cs @@ -22,6 +22,7 @@ using System.Collections.Generic; using System.Windows.Forms; using System.Xml; using VocaluxeLib.Menu.SongMenu; +using VocaluxeLib.Songs; namespace VocaluxeLib.Menu { diff --git a/VocaluxeLib/Menu/IMenu.cs b/VocaluxeLib/Menu/IMenu.cs index b698adaa..0ab9c611 100644 --- a/VocaluxeLib/Menu/IMenu.cs +++ b/VocaluxeLib/Menu/IMenu.cs @@ -21,8 +21,11 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Drawing; +using VocaluxeLib; +using VocaluxeLib.Game; using VocaluxeLib.Menu.SongMenu; using VocaluxeLib.PartyModes; +using VocaluxeLib.Songs; namespace VocaluxeLib.Menu { diff --git a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs index 457fb7fc..a31cc03b 100644 --- a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs +++ b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs @@ -22,6 +22,8 @@ using System.Collections.Generic; using System.Diagnostics; using System.Xml; +using VocaluxeLib.Songs; + namespace VocaluxeLib.Menu.SingNotes { struct SPlayerNotes diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs index 542e4d67..7a7710f4 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs @@ -23,6 +23,7 @@ using System.Drawing; using System.Linq; using System.Windows.Forms; using VocaluxeLib.PartyModes; +using VocaluxeLib.Songs; namespace VocaluxeLib.Menu.SongMenu { diff --git a/VocaluxeLib/Songs/CCategory.cs b/VocaluxeLib/Songs/CCategory.cs index faa5a22a..2f863dc6 100644 --- a/VocaluxeLib/Songs/CCategory.cs +++ b/VocaluxeLib/Songs/CCategory.cs @@ -18,8 +18,9 @@ #endregion using System.Collections.Generic; +using VocaluxeLib; -namespace VocaluxeLib.Menu.SongMenu +namespace VocaluxeLib.Songs { public class CCategory { diff --git a/VocaluxeLib/Songs/CNotes.cs b/VocaluxeLib/Songs/CNotes.cs index de2da998..4f6fc017 100644 --- a/VocaluxeLib/Songs/CNotes.cs +++ b/VocaluxeLib/Songs/CNotes.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace VocaluxeLib.Menu.SingNotes +namespace VocaluxeLib.Songs { public class CNotes { diff --git a/VocaluxeLib/Songs/CSong.cs b/VocaluxeLib/Songs/CSong.cs index c3598585..98275199 100644 --- a/VocaluxeLib/Songs/CSong.cs +++ b/VocaluxeLib/Songs/CSong.cs @@ -22,9 +22,8 @@ using System.Collections.Generic; using System.IO; using System.Text; using System.Text.RegularExpressions; -using VocaluxeLib.Menu.SingNotes; -namespace VocaluxeLib.Menu.SongMenu +namespace VocaluxeLib.Songs { public class CSongPointer { diff --git a/VocaluxeLib/Structs.cs b/VocaluxeLib/Structs.cs index 76dbc466..6df4a21d 100644 --- a/VocaluxeLib/Structs.cs +++ b/VocaluxeLib/Structs.cs @@ -20,9 +20,9 @@ using System; using System.Collections.Generic; using System.Windows.Forms; -using VocaluxeLib.Menu.SingNotes; +using VocaluxeLib.Songs; -namespace VocaluxeLib.Menu +namespace VocaluxeLib { #region Drawing