[vlc-commits] Move pixmaps files in pixmaps/ subfolder
Jean-Baptiste Kempf
git at videolan.org
Thu Jul 28 11:34:19 CEST 2011
npapi-vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jul 28 11:21:29 2011 +0200| [ecb9621633d74de49ba5590f728082bb8c986342] | committer: Jean-Baptiste Kempf
Move pixmaps files in pixmaps/ subfolder
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=ecb9621633d74de49ba5590f728082bb8c986342
---
npapi/npvlc_rc.rc.in | 10 ++++----
npapi/vlcplugin.cpp | 24 ++++++++++----------
share/Makefile.am | 29 ++++++++++++++----------
share/{ => pixmaps/win32}/defullscreen.bmp | Bin 1334 -> 1334 bytes
share/{ => pixmaps/win32}/pause.bmp | Bin 1366 -> 1366 bytes
share/{ => pixmaps/win32}/play.bmp | Bin 1366 -> 1366 bytes
share/{ => pixmaps/win32}/volume-muted.bmp | Bin 1334 -> 1334 bytes
share/{ => pixmaps/win32}/volume.bmp | Bin 1334 -> 1334 bytes
share/{ => pixmaps/x11}/fullscreen.xpm | 0
share/{ => pixmaps/x11}/pause.xpm | 0
share/{ => pixmaps/x11}/play.xpm | 0
share/{ => pixmaps/x11}/skip_next.xpm | 0
share/{ => pixmaps/x11}/skip_previous.xpm | 0
share/{ => pixmaps/x11}/stop.xpm | 0
share/{ => pixmaps/x11}/time_icon.xpm | 0
share/{ => pixmaps/x11}/time_line.xpm | 0
share/{ => pixmaps/x11}/volume_knob.xpm | 0
share/{ => pixmaps/x11}/volume_max.xpm | 0
share/{ => pixmaps/x11}/volume_mute.xpm | 0
share/{ => pixmaps/x11}/volume_slider_bar.xpm | 0
20 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/npapi/npvlc_rc.rc.in b/npapi/npvlc_rc.rc.in
index 626981c..5afb435 100644
--- a/npapi/npvlc_rc.rc.in
+++ b/npapi/npvlc_rc.rc.in
@@ -43,8 +43,8 @@ BEGIN
END
END
-3 BITMAP DISCARDABLE "../share/defullscreen.bmp"
-4 BITMAP DISCARDABLE "../share/play.bmp"
-5 BITMAP DISCARDABLE "../share/pause.bmp"
-6 BITMAP DISCARDABLE "../share/volume.bmp"
-7 BITMAP DISCARDABLE "../share/volume-muted.bmp"
+3 BITMAP DISCARDABLE "../share/pixmaps/win32/defullscreen.bmp"
+4 BITMAP DISCARDABLE "../share/pixmaps/win32/play.bmp"
+5 BITMAP DISCARDABLE "../share/pixmaps/win32/pause.bmp"
+6 BITMAP DISCARDABLE "../share/pixmaps/win32/volume.bmp"
+7 BITMAP DISCARDABLE "../share/pixmaps/win32/volume-muted.bmp"
diff --git a/npapi/vlcplugin.cpp b/npapi/vlcplugin.cpp
index f7b4efb..1842242 100644
--- a/npapi/vlcplugin.cpp
+++ b/npapi/vlcplugin.cpp
@@ -48,18 +48,18 @@
#include <stdlib.h>
#if defined(XP_UNIX)
-#include "../share/fullscreen.xpm"
-#include "../share/pause.xpm"
-#include "../share/play.xpm"
-#include "../share/stop.xpm"
-#include "../share/time_icon.xpm"
-#include "../share/time_line.xpm"
-#include "../share/volume_max.xpm"
-#include "../share/volume_mute.xpm"
-//#include "../share/skip_next.xpm"
-//#include "../share/skip_previous.xpm"
-//#include "../share/volume_knob.xpm"
-//#include "../share/volume_slider_bar.xpm"
+#include "../share/pixmaps/x11/fullscreen.xpm"
+#include "../share/pixmaps/x11/pause.xpm"
+#include "../share/pixmaps/x11/play.xpm"
+#include "../share/pixmaps/x11/stop.xpm"
+#include "../share/pixmaps/x11/time_icon.xpm"
+#include "../share/pixmaps/x11/time_line.xpm"
+#include "../share/pixmaps/x11/volume_max.xpm"
+#include "../share/pixmaps/x11/volume_mute.xpm"
+//#include "../share/pixmaps/x11/skip_next.xpm"
+//#include "../share/pixmaps/x11/skip_previous.xpm"
+//#include "../share/pixmaps/x11/volume_knob.xpm"
+//#include "../share/pixmaps/x11/volume_slider_bar.xpm"
#endif
#ifdef XP_WIN
diff --git a/share/Makefile.am b/share/Makefile.am
index 8619d9a..254a491 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,13 +1,18 @@
dist_pkgdata_DATA = \
- fullscreen.xpm \
- pause.xpm \
- play.xpm \
- skip_next.xpm \
- skip_previous.xpm \
- stop.xpm \
- time_icon.xpm \
- time_line.xpm \
- volume_knob.xpm \
- volume_max.xpm \
- volume_mute.xpm \
- volume_slider_bar.xpm
+ pixmaps/x11/fullscreen.xpm \
+ pixmaps/x11/pause.xpm \
+ pixmaps/x11/play.xpm \
+ pixmaps/x11/skip_next.xpm \
+ pixmaps/x11/skip_previous.xpm \
+ pixmaps/x11/stop.xpm \
+ pixmaps/x11/time_icon.xpm \
+ pixmaps/x11/time_line.xpm \
+ pixmaps/x11/volume_knob.xpm \
+ pixmaps/x11/volume_max.xpm \
+ pixmaps/x11/volume_mute.xpm \
+ pixmaps/x11/volume_slider_bar.xpm \
+ pixmaps/win32/volume-muted.bmp \
+ pixmaps/win32/defullscreen.bmp \
+ pixmaps/win32/pause.bmp \
+ pixmaps/win32/play.bmp \
+ pixmaps/win32/volume.bmp
diff --git a/share/defullscreen.bmp b/share/pixmaps/win32/defullscreen.bmp
similarity index 100%
rename from share/defullscreen.bmp
rename to share/pixmaps/win32/defullscreen.bmp
diff --git a/share/pause.bmp b/share/pixmaps/win32/pause.bmp
similarity index 100%
rename from share/pause.bmp
rename to share/pixmaps/win32/pause.bmp
diff --git a/share/play.bmp b/share/pixmaps/win32/play.bmp
similarity index 100%
rename from share/play.bmp
rename to share/pixmaps/win32/play.bmp
diff --git a/share/volume-muted.bmp b/share/pixmaps/win32/volume-muted.bmp
similarity index 100%
rename from share/volume-muted.bmp
rename to share/pixmaps/win32/volume-muted.bmp
diff --git a/share/volume.bmp b/share/pixmaps/win32/volume.bmp
similarity index 100%
rename from share/volume.bmp
rename to share/pixmaps/win32/volume.bmp
diff --git a/share/fullscreen.xpm b/share/pixmaps/x11/fullscreen.xpm
similarity index 100%
rename from share/fullscreen.xpm
rename to share/pixmaps/x11/fullscreen.xpm
diff --git a/share/pause.xpm b/share/pixmaps/x11/pause.xpm
similarity index 100%
rename from share/pause.xpm
rename to share/pixmaps/x11/pause.xpm
diff --git a/share/play.xpm b/share/pixmaps/x11/play.xpm
similarity index 100%
rename from share/play.xpm
rename to share/pixmaps/x11/play.xpm
diff --git a/share/skip_next.xpm b/share/pixmaps/x11/skip_next.xpm
similarity index 100%
rename from share/skip_next.xpm
rename to share/pixmaps/x11/skip_next.xpm
diff --git a/share/skip_previous.xpm b/share/pixmaps/x11/skip_previous.xpm
similarity index 100%
rename from share/skip_previous.xpm
rename to share/pixmaps/x11/skip_previous.xpm
diff --git a/share/stop.xpm b/share/pixmaps/x11/stop.xpm
similarity index 100%
rename from share/stop.xpm
rename to share/pixmaps/x11/stop.xpm
diff --git a/share/time_icon.xpm b/share/pixmaps/x11/time_icon.xpm
similarity index 100%
rename from share/time_icon.xpm
rename to share/pixmaps/x11/time_icon.xpm
diff --git a/share/time_line.xpm b/share/pixmaps/x11/time_line.xpm
similarity index 100%
rename from share/time_line.xpm
rename to share/pixmaps/x11/time_line.xpm
diff --git a/share/volume_knob.xpm b/share/pixmaps/x11/volume_knob.xpm
similarity index 100%
rename from share/volume_knob.xpm
rename to share/pixmaps/x11/volume_knob.xpm
diff --git a/share/volume_max.xpm b/share/pixmaps/x11/volume_max.xpm
similarity index 100%
rename from share/volume_max.xpm
rename to share/pixmaps/x11/volume_max.xpm
diff --git a/share/volume_mute.xpm b/share/pixmaps/x11/volume_mute.xpm
similarity index 100%
rename from share/volume_mute.xpm
rename to share/pixmaps/x11/volume_mute.xpm
diff --git a/share/volume_slider_bar.xpm b/share/pixmaps/x11/volume_slider_bar.xpm
similarity index 100%
rename from share/volume_slider_bar.xpm
rename to share/pixmaps/x11/volume_slider_bar.xpm
More information about the vlc-commits
mailing list