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

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

Revision: 379
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=379&view=rev
Author:   nickols_k
Date:     2012-11-15 17:33:49 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
more c++ names in .o files

Modified Paths:
--------------
    mplayerxp/mplayerxp.cpp
    mplayerxp/xmpcore/xmp_adecoder.cpp
    mplayerxp/xmpcore/xmp_aplayer.cpp
    mplayerxp/xmpcore/xmp_core.cpp
    mplayerxp/xmpcore/xmp_vdecoder.cpp
    mplayerxp/xmpcore/xmp_vplayer.cpp

Modified: mplayerxp/mplayerxp.cpp
===================================================================
--- mplayerxp/mplayerxp.cpp	2012-11-15 17:27:15 UTC (rev 378)
+++ mplayerxp/mplayerxp.cpp	2012-11-15 17:33:49 UTC (rev 379)
@@ -71,12 +71,12 @@
 #include "libao2/mixer.h"
 
 #include "xmpcore/xmp_core.h"
-#include "xmpcore/xmp_vplayer.h"
-#include "xmpcore/xmp_adecoder.h"
 
 #define MSGT_CLASS MSGT_CPLAYER
 #include "mp_msg.h"
 } // extern "C"
+#include "xmpcore/xmp_vplayer.h"
+#include "xmpcore/xmp_adecoder.h"
 #include "osdep/getch2.h"
 #include "xmpcore/PointerProtector.h"
 #include "dump.h"

Modified: mplayerxp/xmpcore/xmp_adecoder.cpp
===================================================================
--- mplayerxp/xmpcore/xmp_adecoder.cpp	2012-11-15 17:27:15 UTC (rev 378)
+++ mplayerxp/xmpcore/xmp_adecoder.cpp	2012-11-15 17:33:49 UTC (rev 379)
@@ -7,11 +7,11 @@
 #include "mp_msg.h"
 #include "sig_hand.h"
 #include "xmp_core.h"
-#include "xmp_adecoder.h"
 #include "osdep/mplib.h"
 #include "osdep/timer.h"
 #include "libmpcodecs/dec_audio.h"
 }
+#include "xmp_adecoder.h"
 #ifdef ENABLE_DEC_AHEAD_DEBUG
 #define MSG_T(args...) mp_msg(MSGT_GLOBAL, MSGL_DBG2,__FILE__,__LINE__, ## args )
 #else

Modified: mplayerxp/xmpcore/xmp_aplayer.cpp
===================================================================
--- mplayerxp/xmpcore/xmp_aplayer.cpp	2012-11-15 17:27:15 UTC (rev 378)
+++ mplayerxp/xmpcore/xmp_aplayer.cpp	2012-11-15 17:33:49 UTC (rev 379)
@@ -7,13 +7,13 @@
 #include "mp_msg.h"
 #include "sig_hand.h"
 #include "xmp_core.h"
-#include "xmp_aplayer.h"
-#include "xmp_adecoder.h"
 #include "osdep/timer.h"
 #include "libmpcodecs/dec_audio.h"
 
 #include "libao2/audio_out.h"
 }
+#include "xmp_aplayer.h"
+#include "xmp_adecoder.h"
 #ifdef ENABLE_DEC_AHEAD_DEBUG
 #define MSG_T(args...) mp_msg(MSGT_GLOBAL, MSGL_DBG2,__FILE__,__LINE__, ## args )
 #else

Modified: mplayerxp/xmpcore/xmp_core.cpp
===================================================================
--- mplayerxp/xmpcore/xmp_core.cpp	2012-11-15 17:27:15 UTC (rev 378)
+++ mplayerxp/xmpcore/xmp_core.cpp	2012-11-15 17:33:49 UTC (rev 379)
@@ -21,10 +21,6 @@
 #include "osdep/mplib.h"
 
 #include "xmp_core.h"
-#include "xmp_aplayer.h"
-#include "xmp_vplayer.h"
-#include "xmp_adecoder.h"
-#include "xmp_vdecoder.h"
 
 #include "mplayerxp.h"
 #include "libao2/audio_out.h"
@@ -35,6 +31,11 @@
 #include "sig_hand.h"
 #include "osdep/timer.h"
 }
+#include "xmp_aplayer.h"
+#include "xmp_vplayer.h"
+#include "xmp_adecoder.h"
+#include "xmp_vdecoder.h"
+
 #ifdef ENABLE_DEC_AHEAD_DEBUG
 #define MSG_T(args...) mp_msg(MSGT_GLOBAL, MSGL_DBG2,__FILE__,__LINE__, ## args )
 #else

Modified: mplayerxp/xmpcore/xmp_vdecoder.cpp
===================================================================
--- mplayerxp/xmpcore/xmp_vdecoder.cpp	2012-11-15 17:27:15 UTC (rev 378)
+++ mplayerxp/xmpcore/xmp_vdecoder.cpp	2012-11-15 17:33:49 UTC (rev 379)
@@ -3,11 +3,12 @@
 #include "mp_msg.h"
 #include "sig_hand.h"
 #include "xmp_core.h"
-#include "xmp_adecoder.h"
-#include "xmp_vdecoder.h"
 #include "osdep/timer.h"
 #include "libmpcodecs/dec_video.h"
 }
+#include "xmp_adecoder.h"
+#include "xmp_vdecoder.h"
+
 #include <stdio.h>
 #include <unistd.h> // for usleep()
 #include <math.h>

Modified: mplayerxp/xmpcore/xmp_vplayer.cpp
===================================================================
--- mplayerxp/xmpcore/xmp_vplayer.cpp	2012-11-15 17:27:15 UTC (rev 378)
+++ mplayerxp/xmpcore/xmp_vplayer.cpp	2012-11-15 17:33:49 UTC (rev 379)
@@ -1,6 +1,5 @@
 extern "C" {
 #include "mplayerxp.h"
-#include "xmp_vplayer.h"
 #include "xmp_core.h"
 #include "help_mp.h"
 #include "mp_msg.h"
@@ -10,8 +9,10 @@
 #include "libvo/video_out.h"
 #include "osdep/timer.h"
 #include "libmpdemux/demuxer.h"
+}
 #include "xmp_adecoder.h"
-}
+#include "xmp_vplayer.h"
+
 #include <stdio.h>
 #include <unistd.h> // for usleep()
 #include <math.h>

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