moved menu and party mode files to the new lib

2012-12-14 21:47:28 +01:00
1 parent 69420d6977
commit d6c97568c9
@@ -208,9 +208,6 @@
    <Compile Include="Lib\Input\WiiMote\CWiiMote.cs" />
    <Compile Include="Lib\Input\WiiMote\WiiMoteLib.cs" />
    <Compile Include="Lib\Playlist\CPlaylistFile.cs" />
-    <Compile Include="Menu\CParticle.cs" />
-    <Compile Include="Menu\SingNotes\CNotes.cs" />
-    <Compile Include="Menu\SongMenu\CSong.cs" />
    <Compile Include="Lib\Sound\CDirectSoundRecord.cs" />
    <Compile Include="Lib\Sound\COpenALPlay.cs" />
    <Compile Include="Lib\Sound\COpenALRecord.cs" />
@@ -228,35 +225,7 @@
    <Compile Include="Lib\Video\IVideoDecoder.cs" />
    <Compile Include="Lib\Webcam\CAForgeNet.cs" />
    <Compile Include="Lib\Webcam\IWebcam.cs" />
-    <Compile Include="Menu\CBackground.cs" />
-    <Compile Include="Menu\CButton.cs" />
-    <Compile Include="Menu\CEqualizer.cs" />
    <Compile Include="Base\CGraphics.cs" />
-    <Compile Include="Menu\CHelper.cs" />
-    <Compile Include="Menu\CNameSelection.cs" />
-    <Compile Include="Menu\CLyric.cs" />
-    <Compile Include="Menu\CMenu.cs" />
-    <Compile Include="Menu\CInteraction.cs" />
-    <Compile Include="Menu\CObjectInteractions.cs" />
-    <Compile Include="Menu\CPlaylist.cs" />
-    <Compile Include="Menu\CSelectSlide.cs" />
-    <Compile Include="Menu\CStatic.cs" />
-    <Compile Include="Menu\CText.cs" />
-    <Compile Include="Menu\IMenu.cs" />
-    <Compile Include="Menu\IMenuElement.cs" />
-    <Compile Include="Menu\SingNotes\CSingNotes.cs" />
-    <Compile Include="Menu\SingNotes\CSingNotesClassic.cs" />
-    <Compile Include="Menu\SingNotes\ISingNotes.cs" />
-    <Compile Include="Menu\SongMenu\CSongMenu.cs" />
-    <Compile Include="Menu\SongMenu\CSongMenuBook.cs" />
-    <Compile Include="Menu\SongMenu\CSongMenuDreidel.cs" />
-    <Compile Include="Menu\SongMenu\CSongMenuFramework.cs" />
-    <Compile Include="Menu\SongMenu\CSongMenuList.cs" />
-    <Compile Include="Menu\SongMenu\CSongMenuTileBoard.cs" />
-    <Compile Include="Menu\SongMenu\ISongMenu.cs" />
-    <Compile Include="PartyModes\CPartyMode.cs" />
-    <Compile Include="PartyModes\CPartyModeNone.cs" />
-    <Compile Include="PartyModes\IPartyMode.cs" />
    <Compile Include="Program.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -280,8 +249,6 @@
    <Compile Include="Screens\CScreenOptionsVideo.cs" />
    <Compile Include="Screens\CScreenOptionsRecord.cs" />
    <Compile Include="Screens\CScreenOptionsTheme.cs" />
-    <Compile Include="PartyModes\CScreenPartyDummy.cs" />
-    <Compile Include="Menu\CMenuParty.cs" />
    <None Include="app.config">
      <SubType>Designer</SubType>
    </None>
@@ -310,7 +277,12 @@
      <Install>true</Install>
    </BootstrapperPackage>
  </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\VocaluxeLib\VocaluxeLib.csproj">
+      <Project>{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}</Project>
+      <Name>VocaluxeLib</Name>
+    </ProjectReference>
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
@@ -18,7 +18,7 @@ namespace Vocaluxe.Menu
        public string STextureName;
    }

-    class CButton : IMenuElement
+    public class CButton : IMenuElement
    {
        private Basic _Base;
        private SThemeButton _Theme;
@@ -26,7 +26,7 @@ namespace Vocaluxe.Menu
        public EOffOn DrawNegative;
    }

-    class CEqualizer : IMenuElement
+    public class CEqualizer : IMenuElement
    {
        private Basic _Base;
        private SThemeEqualizer _Theme;
@@ -9,7 +9,7 @@ using System.Xml.XPath;

 namespace Vocaluxe.Menu
 {
-    class CHelper
+    public class CHelper
    {
        /// <summary>
        /// Concat strings into one string with ", " as separator.
@@ -26,7 +26,7 @@ namespace Vocaluxe.Menu
        public string SColorName;
    }

-    class CLyric : IMenuElement
+    public class CLyric : IMenuElement
    {
        private Basic _Base;
        private SThemeLyrics _Theme;
@@ -20,7 +20,7 @@ namespace Vocaluxe.Menu
        public float z;
    }

-    abstract class CMenu : IMenu
+    public abstract class CMenu : IMenu
    {        
        private List<CInteraction> _Interactions;
        private int _Selection = 0;
@@ -22,7 +22,7 @@ namespace Vocaluxe.Menu
        public string NameColorName;
    }

-    class CNameSelection : IMenuElement
+    public class CNameSelection : IMenuElement
    {
        class CTile
        {
@@ -5,7 +5,7 @@ using System.Text;

 namespace Vocaluxe.Menu
 {
-    enum EParticeType
+    public enum EParticeType
    {
        Twinkle,
        Star,
@@ -286,7 +286,7 @@ namespace Vocaluxe.Menu
        }
    }

-    class CParticleEffect
+    public class CParticleEffect
    {
        private Basic _Base;
        private List<CParticle> _Stars;
@@ -10,7 +10,7 @@ using Vocaluxe.Menu.SongMenu;

 namespace Vocaluxe.Menu
 {
-    enum EEditMode
+    public enum EEditMode
    {
        None,
        PlaylistName,
@@ -67,7 +67,7 @@ namespace Vocaluxe.Menu
        public CSelectSlide SelectSlideGameMode;
    }

-    class CPlaylist : IMenuElement
+    public class CPlaylist : IMenuElement
    {
        class PlaylistElementContent
        {
@@ -35,7 +35,7 @@ namespace Vocaluxe.Menu
        public EStyle TextStyle;
    }

-    class CSelectSlide : IMenuElement, ICloneable
+    public class CSelectSlide : IMenuElement, ICloneable
    {
        private Basic _Base;
        private SThemeSelectSlide _Theme;
@@ -14,7 +14,7 @@ namespace Vocaluxe.Menu
        public string ColorName;
    }

-    class CStatic : IMenuElement
+    public class CStatic : IMenuElement
    {
        private Basic _Base;

@@ -9,7 +9,7 @@ using Vocaluxe.Menu.SongMenu;

 namespace Vocaluxe.Menu
 {
-    interface IMenu
+    public interface IMenu
    {
        void Initialize(Basic Base);

@@ -40,7 +40,7 @@ namespace Vocaluxe.Menu.SingNotes
        public string SkinPerfectNoteStarName;
    }

-    abstract class CSingNotes : ISingNotes, IMenuElement
+    public abstract class CSingNotes : ISingNotes, IMenuElement
    {
        private Basic _Base;
        private SThemeSingBar _Theme;
@@ -9,7 +9,7 @@ using Vocaluxe.PartyModes;

 namespace Vocaluxe.Menu.SongMenu
 {
-    class CSongMenu : ISongMenu
+    public class CSongMenu : ISongMenu
    {
        private Basic _Base;

@@ -6,7 +6,7 @@ using Vocaluxe.Menu;

 namespace Vocaluxe.PartyModes
 {
-    abstract class CPartyMode : IPartyMode
+    public abstract class CPartyMode : IPartyMode
    {
        protected Basic _Base;
        protected ScreenSongOptions _ScreenSongOptions;
@@ -4,7 +4,7 @@ using System.Text;

 namespace Vocaluxe.PartyModes
 {
-    class CPartyModeNone : CPartyMode
+    public class CPartyModeNone : CPartyMode
    {
        //just a dummy for normal game mode
        public CPartyModeNone()
@@ -7,7 +7,7 @@ using Vocaluxe.Menu;

 namespace Vocaluxe.PartyModes
 {
-    class CScreenPartyDummy : CMenu
+    public class CScreenPartyDummy : CMenu
    {
        // Version number for theme files. Increment it, if you've changed something on the theme files!
        const int ScreenVersion = 1;
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Text;

-using Vocaluxe.Base;
 using Vocaluxe.Menu;

 namespace Vocaluxe.PartyModes
@@ -50,7 +49,7 @@ namespace Vocaluxe.PartyModes
    }
    #endregion Structs

-    interface IPartyMode
+    public interface IPartyMode
    {
        bool Init(string Folder);
        void Initialize(Basic Base);
@@ -15,91 +15,91 @@
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>..\Output\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WIN;ARCH_X86</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
    <DebugType>none</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>..\Output\</OutputPath>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>WIN;ARCH_X86</DefineConstants>
+    <DefineConstants>WIN</DefineConstants>
    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x64'">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>..\Output\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WIN;ARCH_X64</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
    <DebugType>none</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>..\Output\</OutputPath>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>WIN;ARCH_X64</DefineConstants>
+    <DefineConstants>WIN</DefineConstants>
    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugLinux|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>..\Output\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX;ARCH_X86</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseLinux|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
    <DebugType>none</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>..\Output\</OutputPath>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>LINUX;ARCH_X86</DefineConstants>
+    <DefineConstants>LINUX</DefineConstants>
    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|x64'">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>..\Output\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX;ARCH_X64</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|x64'">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
    <DebugType>none</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>..\Output\</OutputPath>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>LINUX;ARCH_X64</DefineConstants>
+    <DefineConstants>LINUX</DefineConstants>
    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
  </PropertyGroup>
  <ItemGroup>
@@ -110,6 +110,39 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
+    <Compile Include="Menu\CBackground.cs" />
+    <Compile Include="Menu\CButton.cs" />
+    <Compile Include="Menu\CEqualizer.cs" />
+    <Compile Include="Menu\CHelper.cs" />
+    <Compile Include="Menu\CInteraction.cs" />
+    <Compile Include="Menu\CLyric.cs" />
+    <Compile Include="Menu\CMenu.cs" />
+    <Compile Include="Menu\CMenuParty.cs" />
+    <Compile Include="Menu\CNameSelection.cs" />
+    <Compile Include="Menu\CObjectInteractions.cs" />
+    <Compile Include="Menu\CParticle.cs" />
+    <Compile Include="Menu\CPlaylist.cs" />
+    <Compile Include="Menu\CSelectSlide.cs" />
+    <Compile Include="Menu\CStatic.cs" />
+    <Compile Include="Menu\CText.cs" />
+    <Compile Include="Menu\IMenu.cs" />
+    <Compile Include="Menu\IMenuElement.cs" />
+    <Compile Include="Menu\SingNotes\CNotes.cs" />
+    <Compile Include="Menu\SingNotes\CSingNotes.cs" />
+    <Compile Include="Menu\SingNotes\CSingNotesClassic.cs" />
+    <Compile Include="Menu\SingNotes\ISingNotes.cs" />
+    <Compile Include="Menu\SongMenu\CSong.cs" />
+    <Compile Include="Menu\SongMenu\CSongMenu.cs" />
+    <Compile Include="Menu\SongMenu\CSongMenuBook.cs" />
+    <Compile Include="Menu\SongMenu\CSongMenuDreidel.cs" />
+    <Compile Include="Menu\SongMenu\CSongMenuFramework.cs" />
+    <Compile Include="Menu\SongMenu\CSongMenuList.cs" />
+    <Compile Include="Menu\SongMenu\CSongMenuTileBoard.cs" />
+    <Compile Include="Menu\SongMenu\ISongMenu.cs" />
+    <Compile Include="PartyModes\CPartyMode.cs" />
+    <Compile Include="PartyModes\CPartyModeNone.cs" />
+    <Compile Include="PartyModes\CScreenPartyDummy.cs" />
+    <Compile Include="PartyModes\IPartyMode.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />