macosx: removed the fspanel artwork for scale factor 1.5

This is a broken concept, since according to the HIGL, one point always equals one pixel on non-HiDPI screens regardless of the actual DPIs or the actual screen resolution.

Additionally, this interferes with our support for HiDPI

manual backport of e5c02705

Makefile.am

@@ -113,59 +113,59 @@ EXTRA_DIST += \
 	extras/package/macosx/Resources/English.lproj/VideoEffects.xib \
 	extras/package/macosx/Resources/English.lproj/Wizard.xib \
 	extras/package/macosx/Resources/fspanel/fs_background.png \
+	extras/package/macosx/Resources/fspanel/fs_background@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_exit_fullscreen.png \
+	extras/package/macosx/Resources/fspanel/fs_exit_fullscreen@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_exit_fullscreen_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_exit_fullscreen_highlight@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_forward.png \
+	extras/package/macosx/Resources/fspanel/fs_forward@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_forward_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_forward_highlight@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_pause.png \
+	extras/package/macosx/Resources/fspanel/fs_pause@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_pause_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_pause_highlight@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_play.png \
+	extras/package/macosx/Resources/fspanel/fs_play@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_play_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_play_highlight@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_rewind.png \
+	extras/package/macosx/Resources/fspanel/fs_rewind@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_rewind_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_rewind_highlight@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_skip_next.png \
+	extras/package/macosx/Resources/fspanel/fs_skip_next@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_skip_next_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_skip_next_highlight@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_skip_previous.png \
+	extras/package/macosx/Resources/fspanel/fs_skip_previous@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_skip_previous_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_skip_previous_highlight@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_stop.png \
+	extras/package/macosx/Resources/fspanel/fs_stop@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_stop_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_stop_highlight@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_time_slider.png \
+	extras/package/macosx/Resources/fspanel/fs_time_slider@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_time_slider_knob.png \
+	extras/package/macosx/Resources/fspanel/fs_time_slider_knob@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_time_slider_knob_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_time_slider_knob_highlight@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_volume_max.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_max@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_volume_max_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_max_highlight@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_volume_mute.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_mute@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_volume_mute_highlight.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_mute_highlight@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_volume_slider_bar.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_slider_bar@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_volume_slider_knob.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_slider_knob@2x.png \
 	extras/package/macosx/Resources/fspanel/fs_volume_slider_knob_highlight.png \
-	extras/package/macosx/Resources/fspanel/fs_background@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_exit_fullscreen@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_exit_fullscreen_highlight@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_forward@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_forward_highlight@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_pause@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_pause_highlight@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_play@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_play_highlight@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_rewind@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_rewind_highlight@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_skip_next@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_skip_next_highlight@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_skip_previous@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_skip_previous_highlight@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_stop@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_stop_highlight@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_time_slider@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_time_slider_knob@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_time_slider_knob_highlight@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_volume_max@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_volume_max_highlight@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_volume_mute@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_volume_mute_highlight@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_volume_slider_bar@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_volume_slider_knob@x1.5.png \
-	extras/package/macosx/Resources/fspanel/fs_volume_slider_knob_highlight@x1.5.png \
+	extras/package/macosx/Resources/fspanel/fs_volume_slider_knob_highlight@2x.png \
 	extras/package/macosx/Resources/icons/aiff.icns \
 	extras/package/macosx/Resources/icons/audio.icns \
 	extras/package/macosx/Resources/icons/avi.icns \

extras/package/macosx/vlc.xcodeproj/project.pbxproj

@@ -220,33 +220,6 @@
 		CC4EFC2D13E96BD00091D19A /* dropzone.png in Resources */ = {isa = PBXBuildFile; fileRef = CC4EFC2C13E96BD00091D19A /* dropzone.png */; };
 		CC5800F51423A80400166912 /* bottombar-mini.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5800F41423A80400166912 /* bottombar-mini.png */; };
 		CC5800F71423A81500166912 /* bottombar-mini.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5800F61423A81500166912 /* bottombar-mini.png */; };
-		CC5801141423A85300166912 /* fs_background@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5800F91423A85300166912 /* fs_background@x1.5.png */; };
-		CC5801151423A85300166912 /* fs_exit_fullscreen_highlight@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5800FA1423A85300166912 /* fs_exit_fullscreen_highlight@x1.5.png */; };
-		CC5801161423A85300166912 /* fs_exit_fullscreen@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5800FB1423A85300166912 /* fs_exit_fullscreen@x1.5.png */; };
-		CC5801171423A85300166912 /* fs_forward_highlight@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5800FC1423A85300166912 /* fs_forward_highlight@x1.5.png */; };
-		CC5801181423A85300166912 /* fs_forward@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5800FD1423A85300166912 /* fs_forward@x1.5.png */; };
-		CC5801191423A85300166912 /* fs_pause_highlight@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5800FE1423A85300166912 /* fs_pause_highlight@x1.5.png */; };
-		CC58011A1423A85300166912 /* fs_pause@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5800FF1423A85300166912 /* fs_pause@x1.5.png */; };
-		CC58011B1423A85300166912 /* fs_play_highlight@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5801001423A85300166912 /* fs_play_highlight@x1.5.png */; };
-		CC58011C1423A85300166912 /* fs_play@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5801011423A85300166912 /* fs_play@x1.5.png */; };
-		CC58011D1423A85300166912 /* fs_rewind_highlight@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5801021423A85300166912 /* fs_rewind_highlight@x1.5.png */; };
-		CC58011E1423A85300166912 /* fs_rewind@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5801031423A85300166912 /* fs_rewind@x1.5.png */; };
-		CC58011F1423A85300166912 /* fs_skip_next_highlight@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5801041423A85300166912 /* fs_skip_next_highlight@x1.5.png */; };
-		CC5801201423A85300166912 /* fs_skip_next@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5801051423A85300166912 /* fs_skip_next@x1.5.png */; };
-		CC5801211423A85300166912 /* fs_skip_previous_highlight@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5801061423A85300166912 /* fs_skip_previous_highlight@x1.5.png */; };
-		CC5801221423A85300166912 /* fs_skip_previous@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5801071423A85300166912 /* fs_skip_previous@x1.5.png */; };
-		CC5801231423A85300166912 /* fs_stop_highlight@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5801081423A85300166912 /* fs_stop_highlight@x1.5.png */; };
-		CC5801241423A85300166912 /* fs_stop@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5801091423A85300166912 /* fs_stop@x1.5.png */; };
-		CC5801251423A85300166912 /* fs_time_slider_knob_highlight@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC58010A1423A85300166912 /* fs_time_slider_knob_highlight@x1.5.png */; };
-		CC5801261423A85300166912 /* fs_time_slider_knob@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC58010B1423A85300166912 /* fs_time_slider_knob@x1.5.png */; };
-		CC5801271423A85300166912 /* fs_time_slider@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC58010C1423A85300166912 /* fs_time_slider@x1.5.png */; };
-		CC5801281423A85300166912 /* fs_volume_max_highlight@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC58010D1423A85300166912 /* fs_volume_max_highlight@x1.5.png */; };
-		CC5801291423A85300166912 /* fs_volume_max@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC58010E1423A85300166912 /* fs_volume_max@x1.5.png */; };
-		CC58012A1423A85300166912 /* fs_volume_mute_highlight@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC58010F1423A85300166912 /* fs_volume_mute_highlight@x1.5.png */; };
-		CC58012B1423A85300166912 /* fs_volume_mute@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5801101423A85300166912 /* fs_volume_mute@x1.5.png */; };
-		CC58012C1423A85300166912 /* fs_volume_slider_bar@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5801111423A85300166912 /* fs_volume_slider_bar@x1.5.png */; };
-		CC58012D1423A85300166912 /* fs_volume_slider_knob_highlight@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5801121423A85300166912 /* fs_volume_slider_knob_highlight@x1.5.png */; };
-		CC58012E1423A85300166912 /* fs_volume_slider_knob@x1.5.png in Resources */ = {isa = PBXBuildFile; fileRef = CC5801131423A85300166912 /* fs_volume_slider_knob@x1.5.png */; };
 		CC68B0331544C1AE00FD9C7F /* vlc-xmas.png in Resources */ = {isa = PBXBuildFile; fileRef = CC68B0321544C1AE00FD9C7F /* vlc-xmas.png */; };
 		CC78DA4413DE056700E9603C /* topbar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = CC78DA4313DE056700E9603C /* topbar_background.png */; };
 		CC8062641021F8790021EB9A /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CC8062631021F8790021EB9A /* dsa_pub.pem */; };
@@ -617,33 +590,6 @@
 		CC5560241365CDC800D54038 /* AudioEffects.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AudioEffects.m; path = ../../../modules/gui/macosx/AudioEffects.m; sourceTree = "<group>"; };
 		CC5800F41423A80400166912 /* bottombar-mini.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottombar-mini.png"; path = "Resources/mainwindow/bottombar-mini.png"; sourceTree = "<group>"; };
 		CC5800F61423A81500166912 /* bottombar-mini.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottombar-mini.png"; path = "Resources/mainwindow_dark/bottombar-mini.png"; sourceTree = "<group>"; };
-		CC5800F91423A85300166912 /* fs_background@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_background@x1.5.png"; path = "Resources/fspanel/fs_background@x1.5.png"; sourceTree = "<group>"; };
-		CC5800FA1423A85300166912 /* fs_exit_fullscreen_highlight@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_exit_fullscreen_highlight@x1.5.png"; path = "Resources/fspanel/fs_exit_fullscreen_highlight@x1.5.png"; sourceTree = "<group>"; };
-		CC5800FB1423A85300166912 /* fs_exit_fullscreen@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_exit_fullscreen@x1.5.png"; path = "Resources/fspanel/fs_exit_fullscreen@x1.5.png"; sourceTree = "<group>"; };
-		CC5800FC1423A85300166912 /* fs_forward_highlight@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_forward_highlight@x1.5.png"; path = "Resources/fspanel/fs_forward_highlight@x1.5.png"; sourceTree = "<group>"; };
-		CC5800FD1423A85300166912 /* fs_forward@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_forward@x1.5.png"; path = "Resources/fspanel/fs_forward@x1.5.png"; sourceTree = "<group>"; };
-		CC5800FE1423A85300166912 /* fs_pause_highlight@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_pause_highlight@x1.5.png"; path = "Resources/fspanel/fs_pause_highlight@x1.5.png"; sourceTree = "<group>"; };
-		CC5800FF1423A85300166912 /* fs_pause@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_pause@x1.5.png"; path = "Resources/fspanel/fs_pause@x1.5.png"; sourceTree = "<group>"; };
-		CC5801001423A85300166912 /* fs_play_highlight@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_play_highlight@x1.5.png"; path = "Resources/fspanel/fs_play_highlight@x1.5.png"; sourceTree = "<group>"; };
-		CC5801011423A85300166912 /* fs_play@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_play@x1.5.png"; path = "Resources/fspanel/fs_play@x1.5.png"; sourceTree = "<group>"; };
-		CC5801021423A85300166912 /* fs_rewind_highlight@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_rewind_highlight@x1.5.png"; path = "Resources/fspanel/fs_rewind_highlight@x1.5.png"; sourceTree = "<group>"; };
-		CC5801031423A85300166912 /* fs_rewind@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_rewind@x1.5.png"; path = "Resources/fspanel/fs_rewind@x1.5.png"; sourceTree = "<group>"; };
-		CC5801041423A85300166912 /* fs_skip_next_highlight@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_skip_next_highlight@x1.5.png"; path = "Resources/fspanel/fs_skip_next_highlight@x1.5.png"; sourceTree = "<group>"; };
-		CC5801051423A85300166912 /* fs_skip_next@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_skip_next@x1.5.png"; path = "Resources/fspanel/fs_skip_next@x1.5.png"; sourceTree = "<group>"; };
-		CC5801061423A85300166912 /* fs_skip_previous_highlight@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_skip_previous_highlight@x1.5.png"; path = "Resources/fspanel/fs_skip_previous_highlight@x1.5.png"; sourceTree = "<group>"; };
-		CC5801071423A85300166912 /* fs_skip_previous@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_skip_previous@x1.5.png"; path = "Resources/fspanel/fs_skip_previous@x1.5.png"; sourceTree = "<group>"; };
-		CC5801081423A85300166912 /* fs_stop_highlight@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_stop_highlight@x1.5.png"; path = "Resources/fspanel/fs_stop_highlight@x1.5.png"; sourceTree = "<group>"; };
-		CC5801091423A85300166912 /* fs_stop@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_stop@x1.5.png"; path = "Resources/fspanel/fs_stop@x1.5.png"; sourceTree = "<group>"; };
-		CC58010A1423A85300166912 /* fs_time_slider_knob_highlight@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_time_slider_knob_highlight@x1.5.png"; path = "Resources/fspanel/fs_time_slider_knob_highlight@x1.5.png"; sourceTree = "<group>"; };
-		CC58010B1423A85300166912 /* fs_time_slider_knob@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_time_slider_knob@x1.5.png"; path = "Resources/fspanel/fs_time_slider_knob@x1.5.png"; sourceTree = "<group>"; };
-		CC58010C1423A85300166912 /* fs_time_slider@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_time_slider@x1.5.png"; path = "Resources/fspanel/fs_time_slider@x1.5.png"; sourceTree = "<group>"; };
-		CC58010D1423A85300166912 /* fs_volume_max_highlight@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_volume_max_highlight@x1.5.png"; path = "Resources/fspanel/fs_volume_max_highlight@x1.5.png"; sourceTree = "<group>"; };
-		CC58010E1423A85300166912 /* fs_volume_max@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_volume_max@x1.5.png"; path = "Resources/fspanel/fs_volume_max@x1.5.png"; sourceTree = "<group>"; };
-		CC58010F1423A85300166912 /* fs_volume_mute_highlight@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_volume_mute_highlight@x1.5.png"; path = "Resources/fspanel/fs_volume_mute_highlight@x1.5.png"; sourceTree = "<group>"; };
-		CC5801101423A85300166912 /* fs_volume_mute@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_volume_mute@x1.5.png"; path = "Resources/fspanel/fs_volume_mute@x1.5.png"; sourceTree = "<group>"; };
-		CC5801111423A85300166912 /* fs_volume_slider_bar@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_volume_slider_bar@x1.5.png"; path = "Resources/fspanel/fs_volume_slider_bar@x1.5.png"; sourceTree = "<group>"; };
-		CC5801121423A85300166912 /* fs_volume_slider_knob_highlight@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_volume_slider_knob_highlight@x1.5.png"; path = "Resources/fspanel/fs_volume_slider_knob_highlight@x1.5.png"; sourceTree = "<group>"; };
-		CC5801131423A85300166912 /* fs_volume_slider_knob@x1.5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fs_volume_slider_knob@x1.5.png"; path = "Resources/fspanel/fs_volume_slider_knob@x1.5.png"; sourceTree = "<group>"; };
 		CC68B0321544C1AE00FD9C7F /* vlc-xmas.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "vlc-xmas.png"; path = "Resources/icons/vlc-xmas.png"; sourceTree = "<group>"; };
 		CC6C01A90DDF3E9200C7D754 /* intf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = intf.h; path = ../../../modules/gui/minimal_macosx/intf.h; sourceTree = SOURCE_ROOT; };
 		CC6C01AA0DDF3E9200C7D754 /* intf.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = intf.m; path = ../../../modules/gui/minimal_macosx/intf.m; sourceTree = SOURCE_ROOT; };
@@ -830,7 +776,6 @@
 		089C167CFE841241C02AAC07 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				CC5800F81423A82100166912 /* fspanel (@1.5x) */,
 				CCCB86BF0ACFDE4A00CF1E10 /* fspanel */,
 				DCF358BC077F1236007DB450 /* xibs */,
 				8E445F86047289E50059A3A7 /* fileicons */,
@@ -1282,40 +1227,6 @@
 			path = snowleo;
 			sourceTree = "<group>";
 		};
-		CC5800F81423A82100166912 /* fspanel (@1.5x) */ = {
-			isa = PBXGroup;
-			children = (
-				CC5800F91423A85300166912 /* fs_background@x1.5.png */,
-				CC5800FA1423A85300166912 /* fs_exit_fullscreen_highlight@x1.5.png */,
-				CC5800FB1423A85300166912 /* fs_exit_fullscreen@x1.5.png */,
-				CC5800FC1423A85300166912 /* fs_forward_highlight@x1.5.png */,
-				CC5800FD1423A85300166912 /* fs_forward@x1.5.png */,
-				CC5800FE1423A85300166912 /* fs_pause_highlight@x1.5.png */,
-				CC5800FF1423A85300166912 /* fs_pause@x1.5.png */,
-				CC5801001423A85300166912 /* fs_play_highlight@x1.5.png */,
-				CC5801011423A85300166912 /* fs_play@x1.5.png */,
-				CC5801021423A85300166912 /* fs_rewind_highlight@x1.5.png */,
-				CC5801031423A85300166912 /* fs_rewind@x1.5.png */,
-				CC5801041423A85300166912 /* fs_skip_next_highlight@x1.5.png */,
-				CC5801051423A85300166912 /* fs_skip_next@x1.5.png */,
-				CC5801061423A85300166912 /* fs_skip_previous_highlight@x1.5.png */,
-				CC5801071423A85300166912 /* fs_skip_previous@x1.5.png */,
-				CC5801081423A85300166912 /* fs_stop_highlight@x1.5.png */,
-				CC5801091423A85300166912 /* fs_stop@x1.5.png */,
-				CC58010A1423A85300166912 /* fs_time_slider_knob_highlight@x1.5.png */,
-				CC58010B1423A85300166912 /* fs_time_slider_knob@x1.5.png */,
-				CC58010C1423A85300166912 /* fs_time_slider@x1.5.png */,
-				CC58010D1423A85300166912 /* fs_volume_max_highlight@x1.5.png */,
-				CC58010E1423A85300166912 /* fs_volume_max@x1.5.png */,
-				CC58010F1423A85300166912 /* fs_volume_mute_highlight@x1.5.png */,
-				CC5801101423A85300166912 /* fs_volume_mute@x1.5.png */,
-				CC5801111423A85300166912 /* fs_volume_slider_bar@x1.5.png */,
-				CC5801121423A85300166912 /* fs_volume_slider_knob_highlight@x1.5.png */,
-				CC5801131423A85300166912 /* fs_volume_slider_knob@x1.5.png */,
-			);
-			name = "fspanel (@1.5x)";
-			sourceTree = "<group>";
-		};
 		CC6C01A40DDF3E7800C7D754 /* Minimal Mac OS X Classes */ = {
 			isa = PBXGroup;
 			children = (
@@ -1660,33 +1571,6 @@
 				CCD83E4E13FEA143004F1652 /* Wizard.xib in Resources */,
 				CC5800F51423A80400166912 /* bottombar-mini.png in Resources */,
 				CC5800F71423A81500166912 /* bottombar-mini.png in Resources */,
-				CC5801141423A85300166912 /* fs_background@x1.5.png in Resources */,
-				CC5801151423A85300166912 /* fs_exit_fullscreen_highlight@x1.5.png in Resources */,
-				CC5801161423A85300166912 /* fs_exit_fullscreen@x1.5.png in Resources */,
-				CC5801171423A85300166912 /* fs_forward_highlight@x1.5.png in Resources */,
-				CC5801181423A85300166912 /* fs_forward@x1.5.png in Resources */,
-				CC5801191423A85300166912 /* fs_pause_highlight@x1.5.png in Resources */,
-				CC58011A1423A85300166912 /* fs_pause@x1.5.png in Resources */,
-				CC58011B1423A85300166912 /* fs_play_highlight@x1.5.png in Resources */,
-				CC58011C1423A85300166912 /* fs_play@x1.5.png in Resources */,
-				CC58011D1423A85300166912 /* fs_rewind_highlight@x1.5.png in Resources */,
-				CC58011E1423A85300166912 /* fs_rewind@x1.5.png in Resources */,
-				CC58011F1423A85300166912 /* fs_skip_next_highlight@x1.5.png in Resources */,
-				CC5801201423A85300166912 /* fs_skip_next@x1.5.png in Resources */,
-				CC5801211423A85300166912 /* fs_skip_previous_highlight@x1.5.png in Resources */,
-				CC5801221423A85300166912 /* fs_skip_previous@x1.5.png in Resources */,
-				CC5801231423A85300166912 /* fs_stop_highlight@x1.5.png in Resources */,
-				CC5801241423A85300166912 /* fs_stop@x1.5.png in Resources */,
-				CC5801251423A85300166912 /* fs_time_slider_knob_highlight@x1.5.png in Resources */,
-				CC5801261423A85300166912 /* fs_time_slider_knob@x1.5.png in Resources */,
-				CC5801271423A85300166912 /* fs_time_slider@x1.5.png in Resources */,
-				CC5801281423A85300166912 /* fs_volume_max_highlight@x1.5.png in Resources */,
-				CC5801291423A85300166912 /* fs_volume_max@x1.5.png in Resources */,
-				CC58012A1423A85300166912 /* fs_volume_mute_highlight@x1.5.png in Resources */,
-				CC58012B1423A85300166912 /* fs_volume_mute@x1.5.png in Resources */,
-				CC58012C1423A85300166912 /* fs_volume_slider_bar@x1.5.png in Resources */,
-				CC58012D1423A85300166912 /* fs_volume_slider_knob_highlight@x1.5.png in Resources */,
-				CC58012E1423A85300166912 /* fs_volume_slider_knob@x1.5.png in Resources */,
 				CCB320721423AAEE002CB53B /* shuffle-blue.png in Resources */,
 				CC0586BA14ACF7C000659A99 /* sidebar-local.png in Resources */,
 				CC0586BB14ACF7C000659A99 /* sidebar-movie.png in Resources */,

modules/gui/macosx/fspanel.h

@@ -35,8 +35,6 @@
     BOOL b_displayed;
     BOOL b_voutWasUpdated;
     int i_device;
-
-    BOOL b_usingBigScreen;
 }
 - (id)initWithContentRect: (NSRect)contentRect
                 styleMask: (NSUInteger)aStyle
@@ -73,7 +71,6 @@
 
 - (BOOL)isDisplayed;
 - (void)setVoutWasUpdated: (int)i_screen;
-- (void)adaptWindowSizeToScreen;
 @end
 
 @interface VLCFSPanelView : NSView
@@ -82,8 +79,6 @@
     NSButton *o_prev, *o_next, *o_bwd, *o_fwd, *o_play, *o_fullscreen;
     NSTextField *o_streamTitle_txt, *o_streamPosition_txt;
     NSSlider *o_fs_timeSlider, *o_fs_volumeSlider;
-
-    BOOL b_usingBigScreen;
 }
 - (id)initWithFrame: (NSRect)frameRect;
 - (void)drawRect: (NSRect)rect;
@@ -101,7 +96,6 @@
 - (IBAction)backward:(id)sender;
 - (IBAction)fsTimeSliderUpdate: (id)sender;
 - (IBAction)fsVolumeSliderUpdate: (id)sender;
-- (void)adaptViewSizeToScreen: (BOOL)b_value;
 
 @end
 

modules/gui/macosx/fspanel.m

@@ -133,12 +133,6 @@
     theScreensFrame = [screen frame];
     theWindowsFrame = [self frame];
 
-    if( theScreensFrame.size.width >= 2560 ) //  27" iMacs, external displays
-        b_usingBigScreen = YES;
-
-    if( (b_usingBigScreen && theWindowsFrame.size.width < 820) || (!b_usingBigScreen && theWindowsFrame.size.width > 550) )
-        [self adaptWindowSizeToScreen];
-
     theCoordinate.x = (theScreensFrame.size.width - theWindowsFrame.size.width) / 2 + theScreensFrame.origin.x;
     theCoordinate.y = (theScreensFrame.size.height / 3) - theWindowsFrame.size.height + theScreensFrame.origin.y;
     [self setFrameTopLeftPoint: theCoordinate];
@@ -387,25 +381,6 @@
         [self center];
     }
 }
-
-- (void)adaptWindowSizeToScreen
-{
-    NSRect theWindowsFrame = [self frame];
-    if( b_usingBigScreen )
-    {
-        theWindowsFrame.size.width = 824;
-        theWindowsFrame.size.height = 131;
-    }
-    else
-    {
-        theWindowsFrame.size.width = 549;
-        theWindowsFrame.size.height = 87;
-    }
-
-    [[self contentView] adaptViewSizeToScreen: b_usingBigScreen];
-
-    [self setFrame:theWindowsFrame display:YES animate:YES];
-}
 @end
 
 /*****************************************************************************
@@ -440,19 +415,6 @@
     [o_text setFont:[NSFont font:[NSFont smallSystemFontSize]]];                     \
     [self addSubview:o_text];
 
-#define restyleButton( o_button, imageOff, imageOn, _x, _y ) \
-    [o_button setFrameOrigin: NSMakePoint( _x, _y )]; \
-    [o_button setImage: [NSImage imageNamed: imageOff]]; \
-    [o_button setAlternateImage: [NSImage imageNamed: imageOn]]; \
-    [o_button sizeToFit]; \
-    [o_button setNeedsDisplay: YES]
-
-#define restyleTextfieldOrSlider( o_field, _x, _y, _w, _h ) \
-    [o_field setFrameOrigin: NSMakePoint( _x, _y )]; \
-    [o_field setFrameSize: NSMakeSize( _w, _h )]; \
-    [o_field setNeedsDisplay: YES]
-
-
 - (id)initWithFrame:(NSRect)frameRect
 {
     id view = [super initWithFrame:frameRect];
@@ -530,30 +492,14 @@
 
 - (void)setPlay
 {
-    if( b_usingBigScreen )
-    {
-        [o_play setImage:[NSImage imageNamed:@"fs_play@x1.5"]];
-        [o_play setAlternateImage: [NSImage imageNamed:@"fs_play_highlight@x1.5"]];
-    }
-    else
-    {
     [o_play setImage:[NSImage imageNamed:@"fs_play"]];
     [o_play setAlternateImage: [NSImage imageNamed:@"fs_play_highlight"]];
-    }
 }
 
 - (void)setPause
 {
-    if( b_usingBigScreen )
-    {
-        [o_play setImage: [NSImage imageNamed:@"fs_pause@x1.5"]];
-        [o_play setAlternateImage: [NSImage imageNamed:@"fs_pause_highlight@x1.5"]];
-    }
-    else
-    {
     [o_play setImage: [NSImage imageNamed:@"fs_pause"]];
     [o_play setAlternateImage: [NSImage imageNamed:@"fs_pause_highlight"]];
-    }
 }
 
 - (void)setStreamTitle:(NSString *)o_title
@@ -645,58 +591,11 @@
     NSRect frame = [self frame];
     NSRect image_rect;
     NSImage *img;
-    if (b_usingBigScreen)
-    {
-        addImage( @"fs_background@x1.5", 0, 0, NSCompositeCopy, 0 );
-        addImage( @"fs_volume_slider_bar@x1.5", 39, 35.5, NSCompositeSourceOver, 0 );
-        addImage( @"fs_volume_mute@x1.5", 24, 27, NSCompositeSourceOver, 0 );
-        addImage( @"fs_volume_max@x1.5", 186, 27, NSCompositeSourceOver, 0 );
-        addImage( @"fs_time_slider@x1.5", 22.5, 79.5, NSCompositeSourceOver, 0);
-    }
-    else
-    {
     addImage( @"fs_background", 0, 0, NSCompositeCopy, 0 );
     addImage( @"fs_volume_slider_bar", 26, 23, NSCompositeSourceOver, 0 );
     addImage( @"fs_volume_mute", 16, 18, NSCompositeSourceOver, 0 );
     addImage( @"fs_volume_max", 124, 18, NSCompositeSourceOver, 0 );
     addImage( @"fs_time_slider", 15, 53, NSCompositeSourceOver, 0);
-    }
-}
-
-- (void)adaptViewSizeToScreen:(BOOL)b_value
-{
-    b_usingBigScreen = b_value;
-
-    if (b_usingBigScreen)
-    {
-        restyleButton( o_prev, @"fs_skip_previous@x1.5", @"fs_skip_previous_highlight@x1.5", 261, 22.5 );
-        restyleButton( o_bwd, @"fs_rewind@x1.5", @"fs_rewind_highlight@x1.5", 316.5, 21 );
-        restyleButton( o_play, @"fs_play@x1.5", @"fs_play_highlight@x1.5", 400.5, 15 );
-        restyleButton( o_fwd, @"fs_forward@x1.5", @"fs_forward_highlight@x1.5", 469.5, 21 );
-        restyleButton( o_next, @"fs_skip_next@x1.5", @"fs_skip_next_highlight@x1.5", 547.5, 22.5 );
-        restyleButton( o_fullscreen, @"fs_exit_fullscreen@x1.5", @"fs_exit_fullscreen_hightlight@x1.5", 765.5, 19.5 );
-        restyleTextfieldOrSlider( o_streamTitle_txt, 148, 96, 528, 21 );
-        [o_streamTitle_txt setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
-        restyleTextfieldOrSlider( o_streamPosition_txt, 718, 96, 82.5, 21 );
-        [o_streamPosition_txt setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
-        restyleTextfieldOrSlider( o_fs_timeSlider, 22.5, 82.5, 777, 13.5 );
-        restyleTextfieldOrSlider( o_fs_volumeSlider, 39, 32, 142.5, 15);
-    }
-    else
-    {
-        restyleButton( o_prev, @"fs_skip_previous", @"fs_skip_previous_highlight", 174, 15 );
-        restyleButton( o_bwd, @"fs_rewind", @"fs_rewind_highlight", 211, 14 );
-        restyleButton( o_play, @"fs_play", @"fs_play_highlight", 267, 10 );
-        restyleButton( o_fwd, @"fs_forward", @"fs_forward_highlight", 313, 14 );
-        restyleButton( o_next, @"fs_skip_next", @"fs_skip_next_highlight", 365, 15 );
-        restyleButton( o_fullscreen, @"fs_exit_fullscreen", @"fs_exit_fullscreen_hightlight", 507, 13 );
-        restyleTextfieldOrSlider( o_streamTitle_txt, 98, 64, 352, 14 );
-        [o_streamTitle_txt setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
-        restyleTextfieldOrSlider( o_streamPosition_txt, 471, 64, 65, 14);
-        [o_streamPosition_txt setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
-        restyleTextfieldOrSlider( o_fs_timeSlider, 15, 55, 518, 9 );
-        restyleTextfieldOrSlider( o_fs_volumeSlider, 26, 20, 95, 10);
-    }
 }
 
 @end