[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[613] mplayerxp

[<nic...@us...>]

Revision: 613
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=613&view=rev
Author:   nickols_k
Date:     2012-12-28 06:34:01 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
rename loader -> win32loader (TRANSACTION END)

Modified Paths:
--------------
    mplayerxp/Makefile
    mplayerxp/libmpcodecs/ad_acm.cpp
    mplayerxp/libmpcodecs/ad_dmo.cpp
    mplayerxp/libmpcodecs/ad_dshow.cpp
    mplayerxp/libmpcodecs/ad_internal.h
    mplayerxp/libmpcodecs/ad_qtaudio.cpp
    mplayerxp/libmpcodecs/ad_twin.cpp
    mplayerxp/libmpcodecs/vd_dmo.cpp
    mplayerxp/libmpcodecs/vd_dshow.cpp
    mplayerxp/libmpcodecs/vd_qtvideo.cpp
    mplayerxp/libmpcodecs/vd_vfw.cpp
    mplayerxp/libmpconf/codec-cfg.cpp
    mplayerxp/libmpdemux/asf.h
    mplayerxp/libmpdemux/aviprint.h
    mplayerxp/libmpdemux/demux_mkv.cpp
    mplayerxp/libmpdemux/demux_mov.cpp
    mplayerxp/libmpdemux/demux_mpxp64.cpp
    mplayerxp/libmpdemux/mux_mpxp64.cpp
    mplayerxp/libmpdemux/mux_raw.cpp
    mplayerxp/libmpdemux/muxer.cpp
    mplayerxp/libmpdemux/stheader.h
    mplayerxp/libmpstream2/s_oss.cpp
    mplayerxp/postproc/af_format.cpp
    mplayerxp/win32loader/Makefile
    mplayerxp/win32loader/wine/avifmt.h
    mplayerxp/xmpcore/xmp_aframe.cpp

Modified: mplayerxp/Makefile
===================================================================
--- mplayerxp/Makefile	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/Makefile	2012-12-28 06:34:01 UTC (rev 613)
@@ -13,7 +13,7 @@
 # these subdirectories required installation due binaries within them
 SUBDIRS = libmpdemux libmpstream2 libmpsub libplaytree libmpcodecs libmpconf libao3 osdep postproc input2 nls libvo2 xmpcore
 ifeq ($(ENABLE_WIN32LOADER),yes)
-SUBDIRS+=loader
+SUBDIRS+=win32loader
 endif
 DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || exit; done
 DO_MAKE_ALL = @ for i in $(SUBDIRS); do $(MAKE) -C $$i all || exit; done
@@ -46,7 +46,7 @@
 	  libmpconf/libmpconf.a \
 	  xmpcore/libxmpcore.a
 ifeq ($(ENABLE_WIN32LOADER),yes)
-	  MP_LIBS += loader/libloader.a
+	  MP_LIBS += win32loader/libwin32loader.a
 endif
 
 LIBS+= $(MP_LIBS) $(LAVC_LIBS) $(EXTRALIBS) -lm

Modified: mplayerxp/libmpcodecs/ad_acm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpcodecs/ad_acm.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -8,7 +8,7 @@
 #define __AD_ACM
 #include "ad_internal.h"
 #include "codecs_ld.h"
-#include "loader/wineacm.h"
+#include "win32loader/wineacm.h"
 #include "libmpdemux/aviprint.h"
 #include "libao3/afmt.h"
 #include "mpxp_help.h"

Modified: mplayerxp/libmpcodecs/ad_dmo.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpcodecs/ad_dmo.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -26,7 +26,7 @@
 
 LIBAD_EXTERN(dmo)
 
-#include "loader/dmo/DMO_AudioDecoder.h"
+#include "win32loader/dmo/DMO_AudioDecoder.h"
 
 struct admo_private_t : public Opaque {
     admo_private_t();

Modified: mplayerxp/libmpcodecs/ad_dshow.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dshow.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpcodecs/ad_dshow.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -7,7 +7,7 @@
 #include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
 #include "ad_internal.h"
 #include "mpxp_help.h"
-#include "loader/dshow/DS_AudioDecoder.h"
+#include "win32loader/dshow/DS_AudioDecoder.h"
 #include "codecs_ld.h"
 
 static const ad_info_t info = {

Modified: mplayerxp/libmpcodecs/ad_internal.h
===================================================================
--- mplayerxp/libmpcodecs/ad_internal.h	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpcodecs/ad_internal.h	2012-12-28 06:34:01 UTC (rev 613)
@@ -1,5 +1,5 @@
 #ifdef __AD_ACM /* simply ugly hack */
-#include "loader/wine/msacm.h"
+#include "win32loader/wine/msacm.h"
 #endif
 #include "libmpconf/codec-cfg.h"
 #include "libmpdemux/demuxer_r.h"

Modified: mplayerxp/libmpcodecs/ad_qtaudio.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpcodecs/ad_qtaudio.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -13,7 +13,7 @@
 #include "mplayerxp.h"
 #include "libao3/afmt.h"
 #ifdef WIN32_LOADER
-#include "loader/ldt_keeper.h"
+#include "win32loader/ldt_keeper.h"
 #endif
 
 #ifdef MACOSX

Modified: mplayerxp/libmpcodecs/ad_twin.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpcodecs/ad_twin.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -7,8 +7,8 @@
 #include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
 #include "ad_internal.h"
 #include "codecs_ld.h"
-#include "loader/ldt_keeper.h"
-#include "loader/wine/windef.h"
+#include "win32loader/ldt_keeper.h"
+#include "win32loader/wine/windef.h"
 #include "libao3/afmt.h"
 #include "libmpdemux/aviprint.h"
 #include "mpxp_help.h"

Modified: mplayerxp/libmpcodecs/vd_dmo.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_dmo.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpcodecs/vd_dmo.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -11,7 +11,7 @@
 
 #include "vd_internal.h"
 #include "codecs_ld.h"
-#include "loader/dmo/DMO_VideoDecoder.h"
+#include "win32loader/dmo/DMO_VideoDecoder.h"
 #include "vd_msg.h"
 
 static const vd_info_t info = {

Modified: mplayerxp/libmpcodecs/vd_dshow.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_dshow.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpcodecs/vd_dshow.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -12,7 +12,7 @@
 
 #include "vd_internal.h"
 
-#include "loader/dshow/DS_VideoDecoder.h"
+#include "win32loader/dshow/DS_VideoDecoder.h"
 #include "codecs_ld.h"
 #include "osdep/bswap.h"
 

Modified: mplayerxp/libmpcodecs/vd_qtvideo.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_qtvideo.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpcodecs/vd_qtvideo.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -13,7 +13,7 @@
 #include "codecs_ld.h"
 
 #ifdef WIN32_LOADER
-#include "loader/ldt_keeper.h"
+#include "win32loader/ldt_keeper.h"
 #endif
 #include "codecs_ld.h"
 #include "vd_msg.h"
@@ -38,7 +38,7 @@
 #include <QuickTime/ImageCodec.h>
 #define dump_ImageDescription(x)
 #else
-#include "loader/qtx/qtxsdk/components.h"
+#include "win32loader/qtx/qtxsdk/components.h"
 #endif
 
 //#include "wine/windef.h"

Modified: mplayerxp/libmpcodecs/vd_vfw.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_vfw.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpcodecs/vd_vfw.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -11,8 +11,8 @@
 
 #include "vd_internal.h"
 #include "codecs_ld.h"
-#include "loader/wine/vfw.h"
-#include "loader/wine/driver.h"
+#include "win32loader/wine/vfw.h"
+#include "win32loader/wine/driver.h"
 #include "libmpdemux/aviprint.h"
 
 static const vd_info_t info_vfw = {

Modified: mplayerxp/libmpconf/codec-cfg.cpp
===================================================================
--- mplayerxp/libmpconf/codec-cfg.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpconf/codec-cfg.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -21,7 +21,7 @@
 #include <string.h>
 
 // for mmioFOURCC:
-#include "loader/wine/avifmt.h"
+#include "win32loader/wine/avifmt.h"
 #include "libvo2/img_format.h"
 #include "codec-cfg.h"
 #include "parser_msg.h"

Modified: mplayerxp/libmpdemux/asf.h
===================================================================
--- mplayerxp/libmpdemux/asf.h	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpdemux/asf.h	2012-12-28 06:34:01 UTC (rev 613)
@@ -3,9 +3,9 @@
 
 //#include "cp_config.h"	/* for WORDS_BIGENDIAN */
 #include <inttypes.h>
-#include "loader/wine/mmreg.h"
-#include "loader/wine/avifmt.h"
-#include "loader/wine/vfw.h"
+#include "win32loader/wine/mmreg.h"
+#include "win32loader/wine/avifmt.h"
+#include "win32loader/wine/vfw.h"
 #include "osdep/bswap.h"
 
 #ifndef MIN

Modified: mplayerxp/libmpdemux/aviprint.h
===================================================================
--- mplayerxp/libmpdemux/aviprint.h	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpdemux/aviprint.h	2012-12-28 06:34:01 UTC (rev 613)
@@ -1,9 +1,9 @@
 #ifndef MPXP_AVIPRINT_H
 #define MPXP_AVIPRINT_H 1
 
-#include "loader/wine/mmreg.h"
-#include "loader/wine/avifmt.h"
-#include "loader/wine/vfw.h"
+#include "win32loader/wine/mmreg.h"
+#include "win32loader/wine/avifmt.h"
+#include "win32loader/wine/vfw.h"
 
 extern void print_avih_flags(MainAVIHeader *h);
 extern void print_avih(MainAVIHeader *h);

Modified: mplayerxp/libmpdemux/demux_mkv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpdemux/demux_mkv.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -41,7 +41,7 @@
 #include "libao3/afmt.h"
 #include "demux_msg.h"
 
-#include "loader/qtx/qtxsdk/components.h"
+#include "win32loader/qtx/qtxsdk/components.h"
 #include "demux_msg.h"
 
 enum {

Modified: mplayerxp/libmpdemux/demux_mov.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mov.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpdemux/demux_mov.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -39,7 +39,7 @@
 #include "qtpalette.h"
 #include "parse_mp4.h" // .MP4 specific stuff
 
-#include "loader/qtx/qtxsdk/components.h"
+#include "win32loader/qtx/qtxsdk/components.h"
 #include "demux_msg.h"
 #include "libao3/afmt.h"
 

Modified: mplayerxp/libmpdemux/demux_mpxp64.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpdemux/demux_mpxp64.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -17,7 +17,7 @@
 #include "demuxer.h"
 #include "demuxer_internal.h"
 #include "stheader.h"
-#include "loader/qtx/qtxsdk/components.h"
+#include "win32loader/qtx/qtxsdk/components.h"
 #include "nls/nls.h"
 #include "libmpsub/subreader.h"
 

Modified: mplayerxp/libmpdemux/mux_mpxp64.cpp
===================================================================
--- mplayerxp/libmpdemux/mux_mpxp64.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpdemux/mux_mpxp64.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -18,10 +18,10 @@
 
 #include "nls/nls.h"
 
-#include "loader/wine/mmreg.h"
-#include "loader/wine/avifmt.h"
-#include "loader/wine/vfw.h"
-#include "loader/qtx/qtxsdk/components.h"
+#include "win32loader/wine/mmreg.h"
+#include "win32loader/wine/avifmt.h"
+#include "win32loader/wine/vfw.h"
+#include "win32loader/qtx/qtxsdk/components.h"
 #include "osdep/bswap.h"
 
 #include "libmpstream2/stream.h"

Modified: mplayerxp/libmpdemux/mux_raw.cpp
===================================================================
--- mplayerxp/libmpdemux/mux_raw.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpdemux/mux_raw.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -10,9 +10,9 @@
 
 #include "version.h"
 
-#include "loader/wine/mmreg.h"
-#include "loader/wine/avifmt.h"
-#include "loader/wine/vfw.h"
+#include "win32loader/wine/mmreg.h"
+#include "win32loader/wine/avifmt.h"
+#include "win32loader/wine/vfw.h"
 #include "osdep/bswap.h"
 #include "muxer.h"
 #include "aviheader.h"

Modified: mplayerxp/libmpdemux/muxer.cpp
===================================================================
--- mplayerxp/libmpdemux/muxer.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpdemux/muxer.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -10,9 +10,9 @@
 
 #include "version.h"
 
-#include "loader/wine/mmreg.h"
-#include "loader/wine/avifmt.h"
-#include "loader/wine/vfw.h"
+#include "win32loader/wine/mmreg.h"
+#include "win32loader/wine/avifmt.h"
+#include "win32loader/wine/vfw.h"
 #include "muxer.h"
 
 muxer_packet_t* new_muxer_packet(float pts,any_t*data,unsigned length,unsigned flags)

Modified: mplayerxp/libmpdemux/stheader.h
===================================================================
--- mplayerxp/libmpdemux/stheader.h	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpdemux/stheader.h	2012-12-28 06:34:01 UTC (rev 613)
@@ -5,9 +5,9 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "loader/wine/mmreg.h"
-#include "loader/wine/avifmt.h"
-#include "loader/wine/vfw.h"
+#include "win32loader/wine/mmreg.h"
+#include "win32loader/wine/avifmt.h"
+#include "win32loader/wine/vfw.h"
 #ifdef __cplusplus
 }
 #endif

Modified: mplayerxp/libmpstream2/s_oss.cpp
===================================================================
--- mplayerxp/libmpstream2/s_oss.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/libmpstream2/s_oss.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -21,7 +21,7 @@
 #include "postproc/af.h"
 #include "libao3/afmt.h"
 #include "libao3/audio_out.h"
-#include "loader/wine/mmreg.h"
+#include "win32loader/wine/mmreg.h"
 #include "stream.h"
 #include "stream_internal.h"
 #include "mrl.h"

Modified: mplayerxp/postproc/af_format.cpp
===================================================================
--- mplayerxp/postproc/af_format.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/postproc/af_format.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -18,7 +18,7 @@
 #include "af_internal.h"
 #include "osdep/bswap.h"
 #include "aflib.h"
-#include "loader/wine/mmreg.h"
+#include "win32loader/wine/mmreg.h"
 #include "pp_msg.h"
 
 // Integer to float conversion through lrintf()

Modified: mplayerxp/win32loader/Makefile
===================================================================
--- mplayerxp/win32loader/Makefile	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/win32loader/Makefile	2012-12-28 06:34:01 UTC (rev 613)
@@ -1,7 +1,7 @@
 include ../mpxp_config.mak
 
 ifeq ($(ENABLE_WIN32LOADER),yes)
-LIBNAME=libloader.a
+LIBNAME=libwin32loader.a
 SUBDIRS=dshow dmo
 else
 LIBNAME=

Modified: mplayerxp/win32loader/wine/avifmt.h
===================================================================
--- mplayerxp/win32loader/wine/avifmt.h	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/win32loader/wine/avifmt.h	2012-12-28 06:34:01 UTC (rev 613)
@@ -9,7 +9,7 @@
 #ifndef NOAVIFMT
 
 #ifndef  __WINE_WINDEF_H
-#include "loader/wine/windef.h"
+#include "win32loader/wine/windef.h"
 #endif
 
 #ifndef __WINE_MMSYSTEM_H

Modified: mplayerxp/xmpcore/xmp_aframe.cpp
===================================================================
--- mplayerxp/xmpcore/xmp_aframe.cpp	2012-12-28 06:24:26 UTC (rev 612)
+++ mplayerxp/xmpcore/xmp_aframe.cpp	2012-12-28 06:34:01 UTC (rev 613)
@@ -6,7 +6,7 @@
 
 #include "xmp_aframe.h"
 #include "libao3/afmt.h"
-#include "loader/wine/mmreg.h"
+#include "win32loader/wine/mmreg.h"
 #include "player_msg.h"
 
 namespace mpxp {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.