2.0.0.2: silverlight: Removed from solution.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@865 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/casparcg.sln b/casparcg.sln
index 2a63d3f1b9cdea1ba35afa68ad7ead81476c1063..36dc0624bc90bf059faffb0769fcc7046735f043 100644 (file)
--- a/casparcg.sln
+++ b/casparcg.sln
@@ -31,8 +31,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oal", "modules\oal\oal.vcxp
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogl", "modules\ogl\ogl.vcxproj", "{88F974F0-D09F-4788-8CF8-F563209E60C1}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "silverlight", "modules\silverlight\silverlight.vcxproj", "{B964D953-8882-454C-A935-DB711D697E39}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image", "modules\image\image.vcxproj", "{3E11FF65-A9DA-4F80-87F2-A7C6379ED5E2}"\r
 EndProject\r
 Global\r
@@ -127,14 +125,6 @@ Global
                {88F974F0-D09F-4788-8CF8-F563209E60C1}.Profile|Win32.Build.0 = Profile|Win32\r
                {88F974F0-D09F-4788-8CF8-F563209E60C1}.Release|Win32.ActiveCfg = Release|Win32\r
                {88F974F0-D09F-4788-8CF8-F563209E60C1}.Release|Win32.Build.0 = Release|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Debug|Win32.Build.0 = Debug|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Develop|Win32.ActiveCfg = Develop|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Develop|Win32.Build.0 = Develop|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Profile|Win32.ActiveCfg = Profile|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Profile|Win32.Build.0 = Profile|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Release|Win32.ActiveCfg = Release|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Release|Win32.Build.0 = Release|Win32\r
                {3E11FF65-A9DA-4F80-87F2-A7C6379ED5E2}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {3E11FF65-A9DA-4F80-87F2-A7C6379ED5E2}.Debug|Win32.Build.0 = Debug|Win32\r
                {3E11FF65-A9DA-4F80-87F2-A7C6379ED5E2}.Develop|Win32.ActiveCfg = Develop|Win32\r
@@ -154,7 +144,6 @@ Global
                {816DEABA-3757-4306-AFE0-C27CF96C4DEA} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
                {82ED7ED6-8A15-40EC-A8AF-F5E712E0DA68} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
                {88F974F0-D09F-4788-8CF8-F563209E60C1} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
-               {B964D953-8882-454C-A935-DB711D697E39} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
                {3E11FF65-A9DA-4F80-87F2-A7C6379ED5E2} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
        EndGlobalSection\r
 EndGlobal\r

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index baf41a0f655e46436ef263fabaac1ccd8e481127..852401a1c3f0575c1d50fca7d906b750a11aaf23 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -273,8 +273,8 @@ public:
 \r
        void encode_hanc(BLUE_UINT32* hanc_data, void* audio_data, size_t audio_samples, size_t audio_nchannels)\r
        {       \r
-               static const auto sample_type = AUDIO_CHANNEL_16BIT | AUDIO_CHANNEL_LITTLEENDIAN;\r
-               static const auto emb_audio_flag = blue_emb_audio_enable | blue_emb_audio_group1_enable;\r
+               const auto sample_type = AUDIO_CHANNEL_16BIT | AUDIO_CHANNEL_LITTLEENDIAN;\r
+               const auto emb_audio_flag = blue_emb_audio_enable | blue_emb_audio_group1_enable;\r
                \r
                hanc_stream_info_struct hanc_stream_info;\r
                memset(&hanc_stream_info, 0, sizeof(hanc_stream_info));\r

diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index 34973fa71c3081ace53bc964458c822afe23f4b5..3f4ec5fae71e08616af44acd0808a46450f3a832 100644 (file)
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -55,9 +55,6 @@
     <ProjectReference Include="..\modules\ogl\ogl.vcxproj">\r
       <Project>{88f974f0-d09f-4788-8cf8-f563209e60c1}</Project>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\modules\silverlight\silverlight.vcxproj">\r
-      <Project>{b964d953-8882-454c-a935-db711d697e39}</Project>\r
-    </ProjectReference>\r
     <ProjectReference Include="..\protocol\protocol.vcxproj">\r
       <Project>{2040b361-1fb6-488e-84a5-38a580da90de}</Project>\r
     </ProjectReference>\r