From 52120bbefddaec684c9cd890ba4dfd8fb44c0637 Mon Sep 17 00:00:00 2001 From: Bennjamin Blast Date: Sun, 18 Dec 2016 16:38:32 -0500 Subject: [PATCH 1/3] Fix case-sensitive file names --- ...tartUpUtilities.cs => StartupUtilities.cs} | 0 server/Http/{HTTPServer.cs => HttpServer.cs} | 0 server/Properties/Resources.resx | 24 +++++++++---------- server/Types/{SubTitle.cs => Subtitle.cs} | 0 util/{Ffmpeg.cs => FFmpeg.cs} | 0 5 files changed, 12 insertions(+), 12 deletions(-) rename SimpleDLNA/{StartUpUtilities.cs => StartupUtilities.cs} (100%) rename server/Http/{HTTPServer.cs => HttpServer.cs} (100%) rename server/Types/{SubTitle.cs => Subtitle.cs} (100%) rename util/{Ffmpeg.cs => FFmpeg.cs} (100%) diff --git a/SimpleDLNA/StartUpUtilities.cs b/SimpleDLNA/StartupUtilities.cs similarity index 100% rename from SimpleDLNA/StartUpUtilities.cs rename to SimpleDLNA/StartupUtilities.cs diff --git a/server/Http/HTTPServer.cs b/server/Http/HttpServer.cs similarity index 100% rename from server/Http/HTTPServer.cs rename to server/Http/HttpServer.cs diff --git a/server/Properties/Resources.resx b/server/Properties/Resources.resx index d12268d3..d2345e84 100644 --- a/server/Properties/Resources.resx +++ b/server/Properties/Resources.resx @@ -119,36 +119,36 @@ - ..\resources\browse.css;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\browse.css;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\resources\contentdirectory.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\contentdirectory.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\resources\connectionmanager.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\connectionmanager.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\resources\MSMediaReceiverRegistrar.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\MSMediaReceiverRegistrar.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\resources\description.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;UTF-8 + ..\Resources\description.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;UTF-8 - ..\resources\x_featurelist.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\x_featurelist.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\resources\favicon.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\favicon.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\resources\large.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\large.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\resources\large.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\large.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\resources\small.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\small.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\resources\small.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\small.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file + diff --git a/server/Types/SubTitle.cs b/server/Types/Subtitle.cs similarity index 100% rename from server/Types/SubTitle.cs rename to server/Types/Subtitle.cs diff --git a/util/Ffmpeg.cs b/util/FFmpeg.cs similarity index 100% rename from util/Ffmpeg.cs rename to util/FFmpeg.cs From 8c5612ce75526f13aeb7d94851dbd5288e413e6e Mon Sep 17 00:00:00 2001 From: Bennjamin Blast Date: Sun, 18 Dec 2016 18:08:55 -0500 Subject: [PATCH 2/3] Relax platform-specific build --- SimpleDLNA/SimpleDLNA.csproj | 6 +++--- sdlna/sdlna.csproj | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/SimpleDLNA/SimpleDLNA.csproj b/SimpleDLNA/SimpleDLNA.csproj index 5246e611..aebbee92 100644 --- a/SimpleDLNA/SimpleDLNA.csproj +++ b/SimpleDLNA/SimpleDLNA.csproj @@ -2,7 +2,7 @@ Debug - x86 + AnyCPU 8.0.30703 2.0 {9BAEFB29-C818-446B-9BB5-014E6A0CBB49} @@ -42,7 +42,7 @@ bin\Debug\ DEBUG;TRACE full - x86 + AnyCPU bin\Debug\SimpleDLNA.exe.CodeAnalysisLog.xml true GlobalSuppressions.cs @@ -252,4 +252,4 @@ --> - \ No newline at end of file + diff --git a/sdlna/sdlna.csproj b/sdlna/sdlna.csproj index 5b1ea40c..4468d017 100644 --- a/sdlna/sdlna.csproj +++ b/sdlna/sdlna.csproj @@ -2,7 +2,7 @@ Debug - x86 + AnyCPU 8.0.30703 2.0 {C99E77FD-0728-4A2F-A9C0-47AAC7CAEFED} @@ -57,7 +57,8 @@ false - D:\bin\ + bin\Release + D:\bin\ TRACE true pdbonly @@ -182,4 +183,4 @@ --> - \ No newline at end of file + From ba906676fb70b65868115e317627bf3dd169c8ae Mon Sep 17 00:00:00 2001 From: Bennjamin Blast Date: Sun, 18 Dec 2016 18:09:17 -0500 Subject: [PATCH 3/3] Fix a few typos --- SimpleDLNA/FormMain.cs | 2 +- sdlna/ProgramIcon.cs | 2 +- server/Http/HttpClient.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SimpleDLNA/FormMain.cs b/SimpleDLNA/FormMain.cs index 5c9043e2..f2a23206 100644 --- a/SimpleDLNA/FormMain.cs +++ b/SimpleDLNA/FormMain.cs @@ -37,7 +37,7 @@ public partial class FormMain : Form, IAppender #if DEBUG private readonly FileInfo logFile = - new FileInfo(Path.Combine(cacheDir, "sdlna.dbg.log")); + new FileInfo(Path.Combine(CacheDir, "sdlna.dbg.log")); #else private readonly FileInfo logFile = new FileInfo(Path.Combine(CacheDir, "sdlna.log")); diff --git a/sdlna/ProgramIcon.cs b/sdlna/ProgramIcon.cs index 2f680e78..b6c27df8 100644 --- a/sdlna/ProgramIcon.cs +++ b/sdlna/ProgramIcon.cs @@ -36,7 +36,7 @@ public ProgramIcon() window, SafeNativeMethods.WM_SETICON, IntPtr.Zero, iconSm); } catch (Exception ex) { - Debug("Couldnd't set icon", ex); + Debug("Couldn't set icon", ex); } } diff --git a/server/Http/HttpClient.cs b/server/Http/HttpClient.cs index cf1628bc..4107c0d4 100644 --- a/server/Http/HttpClient.cs +++ b/server/Http/HttpClient.cs @@ -384,7 +384,7 @@ private void SetupResponse() } catch (HttpStatusException ex) { #if DEBUG - Warn(String.Format("{0} - Got a {2}: {1}", this, path, ex.Code), ex); + Warn(String.Format("{0} - Got a {2}: {1}", this, Path, ex.Code), ex); #else InfoFormat("{0} - Got a {2}: {1}", this, Path, ex.Code); #endif