removed old logos and renamed the current ones

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2130 10f7b99b-c216-0410-bff0-8a66a9350fd8

16 files changed, 65 insertions, 75 deletions

diff --git a/src/apps/mplayerc/res/logo.1.png b/src/apps/mplayerc/res/logo.1.png
index 46c519712..53c2c66cd 100644
--- a/src/apps/mplayerc/res/logo.1.png
+++ b/src/apps/mplayerc/res/logo.1.png
diff --git a/src/apps/mplayerc/res/x64/logo.4.png b/src/apps/mplayerc/res/logo.1_x64.png
index 7e008f652..7e008f652 100644
--- a/src/apps/mplayerc/res/x64/logo.4.png
+++ b/src/apps/mplayerc/res/logo.1_x64.png
diff --git a/src/apps/mplayerc/res/logo.2.png b/src/apps/mplayerc/res/logo.2.png
index f27a60b48..9ee6a389b 100644
--- a/src/apps/mplayerc/res/logo.2.png
+++ b/src/apps/mplayerc/res/logo.2.png
diff --git a/src/apps/mplayerc/res/x64/logo.7.png b/src/apps/mplayerc/res/logo.2_x64.png
index 9b044dd8d..9b044dd8d 100644
--- a/src/apps/mplayerc/res/x64/logo.7.png
+++ b/src/apps/mplayerc/res/logo.2_x64.png
diff --git a/src/apps/mplayerc/res/logo.3.png b/src/apps/mplayerc/res/logo.3.png
deleted file mode 100644
index 5905bc5a9..000000000
--- a/src/apps/mplayerc/res/logo.3.png
+++ /dev/null
diff --git a/src/apps/mplayerc/res/logo.4.png b/src/apps/mplayerc/res/logo.4.png
deleted file mode 100644
index 53c2c66cd..000000000
--- a/src/apps/mplayerc/res/logo.4.png
+++ /dev/null
diff --git a/src/apps/mplayerc/res/logo.5.png b/src/apps/mplayerc/res/logo.5.png
deleted file mode 100644
index e03a79f02..000000000
--- a/src/apps/mplayerc/res/logo.5.png
+++ /dev/null
diff --git a/src/apps/mplayerc/res/logo.6.png b/src/apps/mplayerc/res/logo.6.png
deleted file mode 100644
index fdab9483e..000000000
--- a/src/apps/mplayerc/res/logo.6.png
+++ /dev/null
diff --git a/src/apps/mplayerc/res/logo.7.png b/src/apps/mplayerc/res/logo.7.png
deleted file mode 100644
index 9ee6a389b..000000000
--- a/src/apps/mplayerc/res/logo.7.png
+++ /dev/null
diff --git a/src/apps/mplayerc/res/mpc.png b/src/apps/mplayerc/res/logo.mpc.png
index 61230b249..61230b249 100644
--- a/src/apps/mplayerc/res/mpc.png
+++ b/src/apps/mplayerc/res/logo.mpc.png
diff --git a/src/apps/mplayerc/res/mplayerc.rc2 b/src/apps/mplayerc/res/mplayerc.rc2
index 6b7543278..3eba3b451 100644
--- a/src/apps/mplayerc/res/mplayerc.rc2
+++ b/src/apps/mplayerc/res/mplayerc.rc2
@@ -39,62 +39,62 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
 // FILE

 //

 

-IDF_SHADER_EMPTY        FILE                    "res\\shaders\\empty.psh"

-IDF_SHADER_CONTOUR      FILE                    "res\\shaders\\contour.psh"

-IDF_SHADER_DEINTERLACE  FILE                    "res\\shaders\\deinterlace (blend).psh"

-IDF_SHADER_EMBOSS       FILE                    "res\\shaders\\emboss.psh"

-IDF_SHADER_GRAYSCALE    FILE                    "res\\shaders\\grayscale.psh"

-IDF_SHADER_INVERT       FILE                    "res\\shaders\\invert.psh"

-IDF_SHADER_LETTERBOX    FILE                    "res\\shaders\\letterbox.psh"

-IDF_SHADER_PROCAMP      FILE                    "res\\shaders\\procamp.psh"

-IDF_SHADER_SHARPEN      FILE                    "res\\shaders\\sharpen.psh"

-IDF_SHADER_SPHERE       FILE                    "res\\shaders\\sphere.psh"

-IDF_SHADER_SPOTLIGHT    FILE                    "res\\shaders\\spotlight.psh"

-IDF_SHADER_WAVE         FILE                    "res\\shaders\\wave.psh"

-IDF_SHADER_LEVELS       FILE                    "res\\shaders\\levels.psh"

-IDF_SHADER_LEVELS2      FILE                    "res\\shaders\\levels2.psh"

-IDF_SHADER_LEVELS3      FILE                    "res\\shaders\\levels3.psh"

-IDF_SHADER_BT601_BT709  FILE                    "res\\shaders\\BT601BT709.psh"

-IDF_SHADER_NIGHTVISION  FILE                    "res\\shaders\\nightvision.psh"

-IDF_SHADER_EDGE_SHARPEN FILE                    "res\\shaders\\EdgeSharpen.psh"

-IDF_SHADER_SHARPEN_COMPLEX FILE                    "res\\shaders\\SharpenComplex.psh"

-IDF_SHADER_SHARPEN_COMPLEX2 FILE                    "res\\shaders\\SharpenComplex2.psh"

-IDF_SHADER_DENOISE      FILE                    "res\\shaders\\denoise.psh"

-IDF_SHADER_YV12CHROMAUP FILE                    "res\\shaders\\YV12ChromaUpsampling.psh"

-IDF_DEFAULT_CSS         FILE                    "res\\web\\default.css"

-IDF_VBR_GIF             FILE                    "res\\web\\vbg.gif"

-IDF_VBS_GIF             FILE                    "res\\web\\vbs.GIF"

-IDF_SLIDERBAR_GIF       FILE                    "res\\web\\sliderbar.gif"

-IDF_SLIDERGRIP_GIF      FILE                    "res\\web\\slidergrip.gif"

-IDF_1PIX_GIF            FILE                    "res\\web\\1pix.gif"

-IDF_SLIDERBACK_GIF      FILE                    "res\\web\\sliderback.gif"

-IDF_HEADERICON_PNG      FILE                    "res\\web\\headericon.png"

-IDF_HEADERBACK_PNG      FILE                    "res\\web\\headerback.png"

-IDF_HEADERCLOSE_PNG     FILE                    "res\\web\\headerclose.png"

-IDF_LEFTSIDE_PNG        FILE                    "res\\web\\leftside.png"

-IDF_RIGHTSIDE_PNG       FILE                    "res\\web\\rightside.png"

-IDF_BOTTOMSIDE_PNG      FILE                    "res\\web\\bottomside.png"

-IDF_LEFTBOTTOMSIDE_PNG  FILE                    "res\\web\\leftbottomside.png"

-IDF_RIGHTBOTTOMSIDE_PNG FILE                    "res\\web\\rightbottomside.png"

-IDF_SEEKBARLEFT_PNG     FILE                    "res\\web\\seekbarleft.png"

-IDF_SEEKBARMID_PNG      FILE                    "res\\web\\seekbarmid.png"

-IDF_SEEKBARRIGHT_PNG    FILE                    "res\\web\\seekbarright.png"

-IDF_SEEKBARGRIP_PNG     FILE                    "res\\web\\seekbargrip.png"

-IDF_CONTROLBACK_PNG     FILE                    "res\\web\\controlback.png"

-IDF_CONTROLBUTTONPLAY_PNG FILE                    "res\\web\\controlbuttonplay.png"

-IDF_CONTROLBUTTONPAUSE_PNG FILE                    "res\\web\\controlbuttonpause.png"

-IDF_CONTROLBUTTONSTOP_PNG FILE                    "res\\web\\controlbuttonstop.png"

-IDF_CONTROLBUTTONSKIPBACK_PNG FILE                    "res\\web\\controlbuttonskipback.png"

-IDF_CONTROLBUTTONDECRATE_PNG FILE                    "res\\web\\controlbuttondecrate.png"

-IDF_CONTROLBUTTONINCRATE_PNG FILE                    "res\\web\\controlbuttonincrate.png"

+IDF_SHADER_EMPTY                 FILE                    "res\\shaders\\empty.psh"

+IDF_SHADER_CONTOUR               FILE                    "res\\shaders\\contour.psh"

+IDF_SHADER_DEINTERLACE           FILE                    "res\\shaders\\deinterlace (blend).psh"

+IDF_SHADER_EMBOSS                FILE                    "res\\shaders\\emboss.psh"

+IDF_SHADER_GRAYSCALE             FILE                    "res\\shaders\\grayscale.psh"

+IDF_SHADER_INVERT                FILE                    "res\\shaders\\invert.psh"

+IDF_SHADER_LETTERBOX             FILE                    "res\\shaders\\letterbox.psh"

+IDF_SHADER_PROCAMP               FILE                    "res\\shaders\\procamp.psh"

+IDF_SHADER_SHARPEN               FILE                    "res\\shaders\\sharpen.psh"

+IDF_SHADER_SPHERE                FILE                    "res\\shaders\\sphere.psh"

+IDF_SHADER_SPOTLIGHT             FILE                    "res\\shaders\\spotlight.psh"

+IDF_SHADER_WAVE                  FILE                    "res\\shaders\\wave.psh"

+IDF_SHADER_LEVELS                FILE                    "res\\shaders\\levels.psh"

+IDF_SHADER_LEVELS2               FILE                    "res\\shaders\\levels2.psh"

+IDF_SHADER_LEVELS3               FILE                    "res\\shaders\\levels3.psh"

+IDF_SHADER_BT601_BT709           FILE                    "res\\shaders\\BT601BT709.psh"

+IDF_SHADER_NIGHTVISION           FILE                    "res\\shaders\\nightvision.psh"

+IDF_SHADER_EDGE_SHARPEN          FILE                    "res\\shaders\\EdgeSharpen.psh"

+IDF_SHADER_SHARPEN_COMPLEX       FILE                    "res\\shaders\\SharpenComplex.psh"

+IDF_SHADER_SHARPEN_COMPLEX2      FILE                    "res\\shaders\\SharpenComplex2.psh"

+IDF_SHADER_DENOISE               FILE                    "res\\shaders\\denoise.psh"

+IDF_SHADER_YV12CHROMAUP          FILE                    "res\\shaders\\YV12ChromaUpsampling.psh"

+IDF_DEFAULT_CSS                  FILE                    "res\\web\\default.css"

+IDF_VBR_GIF                      FILE                    "res\\web\\vbg.gif"

+IDF_VBS_GIF                      FILE                    "res\\web\\vbs.GIF"

+IDF_SLIDERBAR_GIF                FILE                    "res\\web\\sliderbar.gif"

+IDF_SLIDERGRIP_GIF               FILE                    "res\\web\\slidergrip.gif"

+IDF_1PIX_GIF                     FILE                    "res\\web\\1pix.gif"

+IDF_SLIDERBACK_GIF               FILE                    "res\\web\\sliderback.gif"

+IDF_HEADERICON_PNG               FILE                    "res\\web\\headericon.png"

+IDF_HEADERBACK_PNG               FILE                    "res\\web\\headerback.png"

+IDF_HEADERCLOSE_PNG              FILE                    "res\\web\\headerclose.png"

+IDF_LEFTSIDE_PNG                 FILE                    "res\\web\\leftside.png"

+IDF_RIGHTSIDE_PNG                FILE                    "res\\web\\rightside.png"

+IDF_BOTTOMSIDE_PNG               FILE                    "res\\web\\bottomside.png"

+IDF_LEFTBOTTOMSIDE_PNG           FILE                    "res\\web\\leftbottomside.png"

+IDF_RIGHTBOTTOMSIDE_PNG          FILE                    "res\\web\\rightbottomside.png"

+IDF_SEEKBARLEFT_PNG              FILE                    "res\\web\\seekbarleft.png"

+IDF_SEEKBARMID_PNG               FILE                    "res\\web\\seekbarmid.png"

+IDF_SEEKBARRIGHT_PNG             FILE                    "res\\web\\seekbarright.png"

+IDF_SEEKBARGRIP_PNG              FILE                    "res\\web\\seekbargrip.png"

+IDF_CONTROLBACK_PNG              FILE                    "res\\web\\controlback.png"

+IDF_CONTROLBUTTONPLAY_PNG        FILE                    "res\\web\\controlbuttonplay.png"

+IDF_CONTROLBUTTONPAUSE_PNG       FILE                    "res\\web\\controlbuttonpause.png"

+IDF_CONTROLBUTTONSTOP_PNG        FILE                    "res\\web\\controlbuttonstop.png"

+IDF_CONTROLBUTTONSKIPBACK_PNG    FILE                    "res\\web\\controlbuttonskipback.png"

+IDF_CONTROLBUTTONDECRATE_PNG     FILE                    "res\\web\\controlbuttondecrate.png"

+IDF_CONTROLBUTTONINCRATE_PNG     FILE                    "res\\web\\controlbuttonincrate.png"

 IDF_CONTROLBUTTONSKIPFORWARD_PNG FILE                    "res\\web\\controlbuttonskipforward.png"

-IDF_CONTROLBUTTONSTEP_PNG FILE                    "res\\web\\controlbuttonstep.png"

-IDF_CONTROLVOLUMEON_PNG FILE                    "res\\web\\controlvolumeon.png"

-IDF_CONTROLVOLUMEOFF_PNG FILE                    "res\\web\\controlvolumeoff.png"

-IDF_CONTROLVOLUMEBAR_PNG FILE                    "res\\web\\controlvolumebar.png"

-IDF_CONTROLVOLUMEGRIP_PNG FILE                    "res\\web\\controlvolumegrip.png"

-IDF_SHADER_RESIZER      FILE                    "res\\shaders\\resizer.psh"

-IDF_LOGO0               FILE                    "res\\logo.0.png"

+IDF_CONTROLBUTTONSTEP_PNG        FILE                    "res\\web\\controlbuttonstep.png"

+IDF_CONTROLVOLUMEON_PNG          FILE                    "res\\web\\controlvolumeon.png"

+IDF_CONTROLVOLUMEOFF_PNG         FILE                    "res\\web\\controlvolumeoff.png"

+IDF_CONTROLVOLUMEBAR_PNG         FILE                    "res\\web\\controlvolumebar.png"

+IDF_CONTROLVOLUMEGRIP_PNG        FILE                    "res\\web\\controlvolumegrip.png"

+IDF_SHADER_RESIZER               FILE                    "res\\shaders\\resizer.psh"

+IDF_LOGO0                        FILE                    "res\\logo.0.png"

 

 

 /////////////////////////////////////////////////////////////////////////////

@@ -102,31 +102,21 @@ IDF_LOGO0               FILE                    "res\\logo.0.png"
 // HTML

 //

 

-IDR_HTML_INDEX          HTML                    "res\\web\\index.html"

-IDR_HTML_404            HTML                    "res\\web\\404.html"

-IDR_HTML_BROWSER        HTML                    "res\\web\\browser.html"

-IDR_HTML_CONTROLS       HTML                    "res\\web\\controls.html"

-IDR_HTML_PLAYER         HTML                    "res\\web\\player.html"

+IDR_HTML_INDEX                   HTML                    "res\\web\\index.html"

+IDR_HTML_404                     HTML                    "res\\web\\404.html"

+IDR_HTML_BROWSER                 HTML                    "res\\web\\browser.html"

+IDR_HTML_CONTROLS                HTML                    "res\\web\\controls.html"

+IDR_HTML_PLAYER                  HTML                    "res\\web\\player.html"

 

 #ifdef _WIN64

-	IDF_LOGO1               FILE                    "res\\x64\\logo.1.png"

-	IDF_LOGO2               FILE                    "res\\x64\\logo.2.png"

-	IDF_LOGO3               FILE                    "res\\x64\\logo.3.png"

-	IDF_LOGO4               FILE                    "res\\x64\\logo.4.png"

-	IDF_LOGO5               FILE                    "res\\x64\\logo.5.png"

-	IDF_LOGO6               FILE                    "res\\x64\\logo.6.png"

-	IDF_LOGO7               FILE                    "res\\x64\\logo.7.png"

+IDF_LOGO1                        FILE                    "res\\logo.1_x64.png"

+IDF_LOGO2                        FILE                    "res\\logo.2_x64.png"

 #else

-	IDF_LOGO1               FILE                    "res\\logo.1.png"

-	IDF_LOGO2               FILE                    "res\\logo.2.png"

-	IDF_LOGO3               FILE                    "res\\logo.3.png"

-	IDF_LOGO4               FILE                    "res\\logo.4.png"

-	IDF_LOGO5               FILE                    "res\\logo.5.png"

-	IDF_LOGO6               FILE                    "res\\logo.6.png"

-	IDF_LOGO7               FILE                    "res\\logo.7.png"

+IDF_LOGO1                        FILE                    "res\\logo.1.png"

+IDF_LOGO2                        FILE                    "res\\logo.2.png"

 #endif

 

-W7_TOOLBAR			PNG			"res\\Toolbarw7.png"

+W7_TOOLBAR                       PNG                     "res\\Toolbarw7.png"

 

 /////////////////////////////////////////////////////////////////////////////

 //

diff --git a/src/apps/mplayerc/res/x64/logo.1.png b/src/apps/mplayerc/res/x64/logo.1.png
deleted file mode 100644
index 4d3ab5024..000000000
--- a/src/apps/mplayerc/res/x64/logo.1.png
+++ /dev/null
diff --git a/src/apps/mplayerc/res/x64/logo.2.png b/src/apps/mplayerc/res/x64/logo.2.png
deleted file mode 100644
index 8acc193a7..000000000
--- a/src/apps/mplayerc/res/x64/logo.2.png
+++ /dev/null
diff --git a/src/apps/mplayerc/res/x64/logo.3.png b/src/apps/mplayerc/res/x64/logo.3.png
deleted file mode 100644
index 9e4e6b3a7..000000000
--- a/src/apps/mplayerc/res/x64/logo.3.png
+++ /dev/null
diff --git a/src/apps/mplayerc/res/x64/logo.5.png b/src/apps/mplayerc/res/x64/logo.5.png
deleted file mode 100644
index d68f2bc0b..000000000
--- a/src/apps/mplayerc/res/x64/logo.5.png
+++ /dev/null
diff --git a/src/apps/mplayerc/res/x64/logo.6.png b/src/apps/mplayerc/res/x64/logo.6.png
deleted file mode 100644
index 13ee629f8..000000000
--- a/src/apps/mplayerc/res/x64/logo.6.png
+++ /dev/null