[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[443] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[443] mplayerxp
|
From: <nic...@us...> - 2012-11-23 16:09:19
|
Revision: 443
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=443&view=rev
Author: nickols_k
Date: 2012-11-23 16:09:06 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
include rootdir xmpcore osdep into namespace mpxp;
Modified Paths:
--------------
mplayerxp/dump.cpp
mplayerxp/dump.h
mplayerxp/input2/input.cpp
mplayerxp/input2/joystick.cpp
mplayerxp/input2/lirc.cpp
mplayerxp/libao2/afmt.cpp
mplayerxp/libao2/ao_alsa9.cpp
mplayerxp/libao2/ao_arts.cpp
mplayerxp/libao2/ao_esd.cpp
mplayerxp/libao2/ao_jack.cpp
mplayerxp/libao2/ao_nas.cpp
mplayerxp/libao2/ao_null.cpp
mplayerxp/libao2/ao_openal.cpp
mplayerxp/libao2/ao_oss.cpp
mplayerxp/libao2/ao_sdl.cpp
mplayerxp/libao2/ao_wav.cpp
mplayerxp/libao2/audio_out.cpp
mplayerxp/libao2/mixer.cpp
mplayerxp/libmpcodecs/ad.cpp
mplayerxp/libmpcodecs/ad_a52.cpp
mplayerxp/libmpcodecs/ad_acm.cpp
mplayerxp/libmpcodecs/ad_dca.cpp
mplayerxp/libmpcodecs/ad_dmo.cpp
mplayerxp/libmpcodecs/ad_dshow.cpp
mplayerxp/libmpcodecs/ad_dvdpcm.cpp
mplayerxp/libmpcodecs/ad_faad.cpp
mplayerxp/libmpcodecs/ad_hwac3.cpp
mplayerxp/libmpcodecs/ad_lavc.cpp
mplayerxp/libmpcodecs/ad_libdv.cpp
mplayerxp/libmpcodecs/ad_mp3.cpp
mplayerxp/libmpcodecs/ad_null.cpp
mplayerxp/libmpcodecs/ad_pcm.cpp
mplayerxp/libmpcodecs/ad_qtaudio.cpp
mplayerxp/libmpcodecs/ad_real.cpp
mplayerxp/libmpcodecs/ad_twin.cpp
mplayerxp/libmpcodecs/ad_vorbis.cpp
mplayerxp/libmpcodecs/codecs_ld.cpp
mplayerxp/libmpcodecs/dec_audio.cpp
mplayerxp/libmpcodecs/dec_video.cpp
mplayerxp/libmpcodecs/liba52/bit_allocate.cpp
mplayerxp/libmpcodecs/liba52/bitstream.cpp
mplayerxp/libmpcodecs/liba52/crc.cpp
mplayerxp/libmpcodecs/liba52/downmix.cpp
mplayerxp/libmpcodecs/liba52/imdct.cpp
mplayerxp/libmpcodecs/liba52/parse.cpp
mplayerxp/libmpcodecs/liba52/resample.cpp
mplayerxp/libmpcodecs/libdca/bitstream.cpp
mplayerxp/libmpcodecs/libdca/downmix.cpp
mplayerxp/libmpcodecs/libdca/parse.cpp
mplayerxp/libmpcodecs/libdca/resample.cpp
mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.cpp
mplayerxp/libmpcodecs/libnuppelvideo/minilzo.cpp
mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.cpp
mplayerxp/libmpcodecs/vd.cpp
mplayerxp/libmpcodecs/vd_divx4.cpp
mplayerxp/libmpcodecs/vd_dmo.cpp
mplayerxp/libmpcodecs/vd_dshow.cpp
mplayerxp/libmpcodecs/vd_huffyuv.cpp
mplayerxp/libmpcodecs/vd_lavc.cpp
mplayerxp/libmpcodecs/vd_libdv.cpp
mplayerxp/libmpcodecs/vd_libmpeg2.cpp
mplayerxp/libmpcodecs/vd_mpegpes.cpp
mplayerxp/libmpcodecs/vd_null.cpp
mplayerxp/libmpcodecs/vd_nuv.cpp
mplayerxp/libmpcodecs/vd_qtvideo.cpp
mplayerxp/libmpcodecs/vd_raw.cpp
mplayerxp/libmpcodecs/vd_real.cpp
mplayerxp/libmpcodecs/vd_theora.cpp
mplayerxp/libmpcodecs/vd_vfw.cpp
mplayerxp/libmpcodecs/vd_xanim.cpp
mplayerxp/libmpcodecs/vd_xvid.cpp
mplayerxp/libmpconf/cfgparser.cpp
mplayerxp/libmpconf/codec-cfg.cpp
mplayerxp/libmpconf/m_option.cpp
mplayerxp/libmpconf/m_property.cpp
mplayerxp/libmpconf/m_struct.cpp
mplayerxp/libmpconf/subopt-helper.cpp
mplayerxp/libmpdemux/aviprint.cpp
mplayerxp/libmpdemux/demux_aiff.cpp
mplayerxp/libmpdemux/demux_asf.cpp
mplayerxp/libmpdemux/demux_audio.cpp
mplayerxp/libmpdemux/demux_avi.cpp
mplayerxp/libmpdemux/demux_bmp.cpp
mplayerxp/libmpdemux/demux_demuxers.cpp
mplayerxp/libmpdemux/demux_dv.cpp
mplayerxp/libmpdemux/demux_film.cpp
mplayerxp/libmpdemux/demux_fli.cpp
mplayerxp/libmpdemux/demux_lavf.cpp
mplayerxp/libmpdemux/demux_mkv.cpp
mplayerxp/libmpdemux/demux_mov.cpp
mplayerxp/libmpdemux/demux_mpg.cpp
mplayerxp/libmpdemux/demux_mpxp64.cpp
mplayerxp/libmpdemux/demux_nsv.cpp
mplayerxp/libmpdemux/demux_null.cpp
mplayerxp/libmpdemux/demux_nuv.cpp
mplayerxp/libmpdemux/demux_ogg.cpp
mplayerxp/libmpdemux/demux_pva.cpp
mplayerxp/libmpdemux/demux_ra.cpp
mplayerxp/libmpdemux/demux_rawaudio.cpp
mplayerxp/libmpdemux/demux_rawvideo.cpp
mplayerxp/libmpdemux/demux_real.cpp
mplayerxp/libmpdemux/demux_roq.cpp
mplayerxp/libmpdemux/demux_smjpeg.cpp
mplayerxp/libmpdemux/demux_ts.cpp
mplayerxp/libmpdemux/demux_ty.cpp
mplayerxp/libmpdemux/demux_viv.cpp
mplayerxp/libmpdemux/demux_vqf.cpp
mplayerxp/libmpdemux/demux_y4m.cpp
mplayerxp/libmpdemux/demuxer.cpp
mplayerxp/libmpdemux/demuxer_r.cpp
mplayerxp/libmpdemux/mp3_hdr.cpp
mplayerxp/libmpdemux/mpdemux.cpp
mplayerxp/libmpdemux/mpeg_hdr.cpp
mplayerxp/libmpdemux/mux_lavf.cpp
mplayerxp/libmpdemux/mux_mpxp64.cpp
mplayerxp/libmpdemux/mux_raw.cpp
mplayerxp/libmpdemux/muxer.cpp
mplayerxp/libmpdemux/parse_es.cpp
mplayerxp/libmpdemux/parse_mp4.cpp
mplayerxp/libmpdemux/sub_cc.cpp
mplayerxp/libmpdemux/sub_ty.cpp
mplayerxp/libmpdemux/video.cpp
mplayerxp/libmpdemux/yuv4mpeg.cpp
mplayerxp/libmpdemux/yuv4mpeg_ratio.cpp
mplayerxp/libmpstream/asf_mmst_streaming.cpp
mplayerxp/libmpstream/asf_streaming.cpp
mplayerxp/libmpstream/cache2.cpp
mplayerxp/libmpstream/cdda.cpp
mplayerxp/libmpstream/cddb.cpp
mplayerxp/libmpstream/cookies.cpp
mplayerxp/libmpstream/freesdp/common.cpp
mplayerxp/libmpstream/freesdp/errorlist.cpp
mplayerxp/libmpstream/freesdp/parser.cpp
mplayerxp/libmpstream/http.cpp
mplayerxp/libmpstream/librtsp/rtsp.cpp
mplayerxp/libmpstream/librtsp/rtsp_rtp.cpp
mplayerxp/libmpstream/librtsp/rtsp_session.cpp
mplayerxp/libmpstream/mrl.cpp
mplayerxp/libmpstream/network.cpp
mplayerxp/libmpstream/pnm.cpp
mplayerxp/libmpstream/realrtsp/asmrp.cpp
mplayerxp/libmpstream/realrtsp/md5.cpp
mplayerxp/libmpstream/realrtsp/real.cpp
mplayerxp/libmpstream/realrtsp/rmff.cpp
mplayerxp/libmpstream/realrtsp/sdpplin.cpp
mplayerxp/libmpstream/realrtsp/xbuffer.cpp
mplayerxp/libmpstream/rtp.cpp
mplayerxp/libmpstream/s_cdd.cpp
mplayerxp/libmpstream/s_dvdnav.cpp
mplayerxp/libmpstream/s_dvdread.cpp
mplayerxp/libmpstream/s_file.cpp
mplayerxp/libmpstream/s_ftp.cpp
mplayerxp/libmpstream/s_lavc.cpp
mplayerxp/libmpstream/s_network.cpp
mplayerxp/libmpstream/s_null.cpp
mplayerxp/libmpstream/s_oss.cpp
mplayerxp/libmpstream/s_rtsp.cpp
mplayerxp/libmpstream/s_tv.cpp
mplayerxp/libmpstream/s_udp.cpp
mplayerxp/libmpstream/s_vcdnav.cpp
mplayerxp/libmpstream/stream.cpp
mplayerxp/libmpstream/tcp.cpp
mplayerxp/libmpstream/tvi/frequencies.cpp
mplayerxp/libmpstream/tvi/tvi_bsdbt848.cpp
mplayerxp/libmpstream/tvi/tvi_dummy.cpp
mplayerxp/libmpstream/tvi/tvi_v4l.cpp
mplayerxp/libmpstream/udp.cpp
mplayerxp/libmpstream/url.cpp
mplayerxp/libmpsub/find_sub.cpp
mplayerxp/libmpsub/spudec.cpp
mplayerxp/libmpsub/subreader.cpp
mplayerxp/libmpsub/vobsub.cpp
mplayerxp/libplaytree/asxparser.cpp
mplayerxp/libplaytree/playtree.cpp
mplayerxp/libplaytree/playtreeparser.cpp
mplayerxp/libvo/aspect.cpp
mplayerxp/libvo/font_load.cpp
mplayerxp/libvo/img_format.cpp
mplayerxp/libvo/jpeg_enc.cpp
mplayerxp/libvo/osd.cpp
mplayerxp/libvo/screenshot.cpp
mplayerxp/libvo/sub.cpp
mplayerxp/libvo/video_out.cpp
mplayerxp/libvo/vo_dga.cpp
mplayerxp/libvo/vo_fbdev.cpp
mplayerxp/libvo/vo_null.cpp
mplayerxp/libvo/vo_opengl.cpp
mplayerxp/libvo/vo_sdl.cpp
mplayerxp/libvo/vo_vesa.cpp
mplayerxp/libvo/vo_x11.cpp
mplayerxp/libvo/vo_xv.cpp
mplayerxp/libvo/vosub_vidix.cpp
mplayerxp/libvo/x11_common.cpp
mplayerxp/mp-opt-reg.cpp
mplayerxp/mp_msg.cpp
mplayerxp/mplayerxp.cpp
mplayerxp/mplayerxp.h
mplayerxp/nls/recode.cpp
mplayerxp/osdep/aclib.cpp
mplayerxp/osdep/bswap.h
mplayerxp/osdep/cpudetect.cpp
mplayerxp/osdep/cpudetect.h
mplayerxp/osdep/get_path.cpp
mplayerxp/osdep/get_path.h
mplayerxp/osdep/getch2.cpp
mplayerxp/osdep/getch2.h
mplayerxp/osdep/keycodes.h
mplayerxp/osdep/lrmi.cpp
mplayerxp/osdep/lrmi.h
mplayerxp/osdep/mm_accel.h
mplayerxp/osdep/mp_malloc.cpp
mplayerxp/osdep/mplib.cpp
mplayerxp/osdep/shmem.cpp
mplayerxp/osdep/shmem.h
mplayerxp/osdep/timer-lx.cpp
mplayerxp/osdep/timer.cpp
mplayerxp/osdep/timer.h
mplayerxp/osdep/vbelib.cpp
mplayerxp/osdep/vbelib.h
mplayerxp/postproc/af.cpp
mplayerxp/postproc/af_ao2.cpp
mplayerxp/postproc/af_channels.cpp
mplayerxp/postproc/af_crystality.cpp
mplayerxp/postproc/af_delay.cpp
mplayerxp/postproc/af_dyn.cpp
mplayerxp/postproc/af_echo3d.cpp
mplayerxp/postproc/af_equalizer.cpp
mplayerxp/postproc/af_export.cpp
mplayerxp/postproc/af_extrastereo.cpp
mplayerxp/postproc/af_ffenc.cpp
mplayerxp/postproc/af_format.cpp
mplayerxp/postproc/af_hrtf.cpp
mplayerxp/postproc/af_karaoke.cpp
mplayerxp/postproc/af_lp.cpp
mplayerxp/postproc/af_null.cpp
mplayerxp/postproc/af_pan.cpp
mplayerxp/postproc/af_raw.cpp
mplayerxp/postproc/af_resample.cpp
mplayerxp/postproc/af_scaletempo.cpp
mplayerxp/postproc/af_sinesuppress.cpp
mplayerxp/postproc/af_sub.cpp
mplayerxp/postproc/af_surround.cpp
mplayerxp/postproc/af_tools.cpp
mplayerxp/postproc/af_volnorm.cpp
mplayerxp/postproc/af_volume.cpp
mplayerxp/postproc/aflib.cpp
mplayerxp/postproc/libmenu/menu.cpp
mplayerxp/postproc/libmenu/menu_cmdlist.cpp
mplayerxp/postproc/libmenu/menu_console.cpp
mplayerxp/postproc/libmenu/menu_filesel.cpp
mplayerxp/postproc/libmenu/menu_list.cpp
mplayerxp/postproc/libmenu/menu_param.cpp
mplayerxp/postproc/libmenu/menu_pt.cpp
mplayerxp/postproc/libmenu/menu_txt.cpp
mplayerxp/postproc/postprocess.cpp
mplayerxp/postproc/swscale.cpp
mplayerxp/postproc/vf.cpp
mplayerxp/postproc/vf_1bpp.cpp
mplayerxp/postproc/vf_2xsai.cpp
mplayerxp/postproc/vf_aspect.cpp
mplayerxp/postproc/vf_delogo.cpp
mplayerxp/postproc/vf_denoise3d.cpp
mplayerxp/postproc/vf_dint.cpp
mplayerxp/postproc/vf_down3dright.cpp
mplayerxp/postproc/vf_eq.cpp
mplayerxp/postproc/vf_expand.cpp
mplayerxp/postproc/vf_flip.cpp
mplayerxp/postproc/vf_format.cpp
mplayerxp/postproc/vf_framestep.cpp
mplayerxp/postproc/vf_il.cpp
mplayerxp/postproc/vf_menu.cpp
mplayerxp/postproc/vf_mirror.cpp
mplayerxp/postproc/vf_noise.cpp
mplayerxp/postproc/vf_null.cpp
mplayerxp/postproc/vf_ow.cpp
mplayerxp/postproc/vf_palette.cpp
mplayerxp/postproc/vf_panscan.cpp
mplayerxp/postproc/vf_perspective.cpp
mplayerxp/postproc/vf_pp.cpp
mplayerxp/postproc/vf_raw.cpp
mplayerxp/postproc/vf_rectangle.cpp
mplayerxp/postproc/vf_rgb2bgr.cpp
mplayerxp/postproc/vf_rotate.cpp
mplayerxp/postproc/vf_scale.cpp
mplayerxp/postproc/vf_smartblur.cpp
mplayerxp/postproc/vf_softpulldown.cpp
mplayerxp/postproc/vf_swapuv.cpp
mplayerxp/postproc/vf_test.cpp
mplayerxp/postproc/vf_unsharp.cpp
mplayerxp/postproc/vf_vo.cpp
mplayerxp/postproc/vf_yuvcsp.cpp
mplayerxp/postproc/vf_yuy2.cpp
mplayerxp/postproc/vf_yvu9.cpp
mplayerxp/xmpcore/PointerProtector.h
mplayerxp/xmpcore/mp_aframe.cpp
mplayerxp/xmpcore/mp_aframe.h
mplayerxp/xmpcore/mp_image.cpp
mplayerxp/xmpcore/mp_image.h
mplayerxp/xmpcore/sig_hand.cpp
mplayerxp/xmpcore/sig_hand.h
mplayerxp/xmpcore/xmp_adecoder.cpp
mplayerxp/xmpcore/xmp_adecoder.h
mplayerxp/xmpcore/xmp_aplayer.cpp
mplayerxp/xmpcore/xmp_aplayer.h
mplayerxp/xmpcore/xmp_core.cpp
mplayerxp/xmpcore/xmp_core.h
mplayerxp/xmpcore/xmp_enums.h
mplayerxp/xmpcore/xmp_vdecoder.cpp
mplayerxp/xmpcore/xmp_vdecoder.h
mplayerxp/xmpcore/xmp_vplayer.cpp
mplayerxp/xmpcore/xmp_vplayer.h
Modified: mplayerxp/dump.cpp
===================================================================
--- mplayerxp/dump.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/dump.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
dump.c - stream dumper
*/
@@ -7,20 +10,17 @@
#define __USE_ISOC99 1 /* for lrint */
#include <math.h>
-#include "mp_config.h"
-
#include "xmpcore/sig_hand.h"
#include "help_mp.h"
#include "input2/input.h"
#include "mplayerxp.h"
#include "libmpdemux/muxer.h"
#include "libmpstream/mrl.h"
-#include "osdep/mplib.h"
#define MSGT_CLASS MSGT_GLOBAL
#include "mp_msg.h"
#include "dump.h"
-using namespace mpxp;
+namespace mpxp {
static char *media=NULL,*port=NULL;
@@ -462,3 +462,5 @@
,priv->m_audio?priv->m_audio->wf->nChannels:-1
,priv->asize);
}
+
+} // namespace mpxp
Modified: mplayerxp/dump.h
===================================================================
--- mplayerxp/dump.h 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/dump.h 2012-11-23 16:09:06 UTC (rev 443)
@@ -4,12 +4,12 @@
#ifndef DUMP_H_INCLUDED
#define DUMP_H_INCLUDED 1
#include "libmpdemux/demuxer_r.h"
-
-extern int dump_parse(const char *param);
-extern void dump_stream(stream_t *stream);
-extern void dump_mux_init(demuxer_t *demuxer,any_t*libinput);
-extern void dump_mux(demuxer_t *demuxer,int use_pts,const char *seek_to_sec,unsigned play_n_frames);
-extern void dump_mux_close(demuxer_t *demuxer);
-extern void __FASTCALL__ dump_stream_event_handler(struct stream_s *s,const stream_packet_t*sp);
-
+namespace mpxp {
+ int dump_parse(const char *param);
+ void dump_stream(stream_t *stream);
+ void dump_mux_init(demuxer_t *demuxer,any_t*libinput);
+ void dump_mux(demuxer_t *demuxer,int use_pts,const char *seek_to_sec,unsigned play_n_frames);
+ void dump_mux_close(demuxer_t *demuxer);
+ void __FASTCALL__ dump_stream_event_handler(struct stream_s *s,const stream_packet_t*sp);
+} //namespace
#endif
Modified: mplayerxp/input2/input.cpp
===================================================================
--- mplayerxp/input2/input.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/input2/input.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
@@ -18,7 +21,6 @@
#include "osdep/keycodes.h"
#include "osdep/get_path.h"
#include "osdep/timer.h"
-#include "osdep/mplib.h"
#include "libmpconf/cfgparser.h"
#include "in_msg.h"
@@ -33,8 +35,6 @@
#include "joystick.h"
#include "osdep/getch2.h"
-using namespace mpxp;
-
#ifndef MP_MAX_KEY_FD
#define MP_MAX_KEY_FD 10
#endif
Modified: mplayerxp/input2/joystick.cpp
===================================================================
--- mplayerxp/input2/joystick.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/input2/joystick.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,9 +1,10 @@
#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#ifdef HAVE_JOYSTICK
#include "joystick.h"
#include "input.h"
-#include "osdep/mplib.h"
#include <stdlib.h>
#include <stdio.h>
@@ -14,8 +15,6 @@
#include <fcntl.h>
#include <errno.h>
-using namespace mpxp;
-
#ifndef JOY_AXIS_DELTA
#define JOY_AXIS_DELTA 500
#endif
Modified: mplayerxp/input2/lirc.cpp
===================================================================
--- mplayerxp/input2/lirc.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/input2/lirc.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,4 +1,6 @@
#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#ifdef HAVE_LIRC
@@ -15,8 +17,6 @@
#include "input.h"
#include "in_msg.h"
-using namespace mpxp;
-
static struct lirc_config *lirc_config;
char *lirc_configfile;
Modified: mplayerxp/libao2/afmt.cpp
===================================================================
--- mplayerxp/libao2/afmt.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libao2/afmt.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,7 +1,7 @@
-#include "afmt.h"
+#include "mp_config.h"
#include "osdep/mplib.h"
-
using namespace mpxp;
+#include "afmt.h"
const char* afmt2str(unsigned fmt) {
const char* rs = "AFMT_Unknown";
Modified: mplayerxp/libao2/ao_alsa9.cpp
===================================================================
--- mplayerxp/libao2/ao_alsa9.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libao2/ao_alsa9.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
ao_alsa9 - ALSA-0.9.x output plugin for MPlayer
@@ -17,7 +20,6 @@
#include <string.h>
#include <sys/poll.h>
-#include "mp_config.h"
#include "mplayerxp.h"
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
@@ -28,10 +30,7 @@
#include "afmt.h"
#include "ao_msg.h"
#include "libmpstream/mrl.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
static ao_info_t info =
{
"ALSA-1.x audio output",
Modified: mplayerxp/libao2/ao_arts.cpp
===================================================================
--- mplayerxp/libao2/ao_arts.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libao2/ao_arts.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* aRts (KDE analogue Real-Time synthesizer) audio output driver for MPlayerXP
*
@@ -23,15 +26,12 @@
#include <artsc.h>
#include <stdio.h>
-#include "mp_config.h"
#include "audio_out.h"
#include "audio_out_internal.h"
#include "postproc/af.h"
#include "afmt.h"
#include "ao_msg.h"
-using namespace mpxp;
-
/* Feel mp_free to experiment with the following values: */
#define ARTS_PACKETS 10 /* Number of audio packets */
#define ARTS_PACKET_SIZE_LOG2 11 /* Log2 of audio packet size */
Modified: mplayerxp/libao2/ao_esd.cpp
===================================================================
--- mplayerxp/libao2/ao_esd.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libao2/ao_esd.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* EsounD (Enlightened Sound Daemon) audio output driver for MPlayerXP
*
@@ -47,16 +50,12 @@
#endif
#include <esd.h>
-#include "mp_config.h"
#include "audio_out.h"
#include "audio_out_internal.h"
#include "postproc/af.h"
#include "afmt.h"
#include "ao_msg.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
#define ESD_RESAMPLES 0
#define ESD_DEBUG 0
Modified: mplayerxp/libao2/ao_jack.cpp
===================================================================
--- mplayerxp/libao2/ao_jack.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libao2/ao_jack.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* JACK audio output driver for MPlayer
*
@@ -26,21 +29,16 @@
#include <string.h>
#include <unistd.h>
-#include "mp_config.h"
-
#include "audio_out.h"
#include "audio_out_internal.h"
#include "postproc/af.h"
#include "afmt.h"
#include "osdep/timer.h"
-#include "osdep/mplib.h"
#include "ao_msg.h"
#include "mp_conf_lavc.h"
#include <jack/jack.h>
-using namespace mpxp;
-
static const ao_info_t info =
{
"JACK audio output",
Modified: mplayerxp/libao2/ao_nas.cpp
===================================================================
--- mplayerxp/libao2/ao_nas.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libao2/ao_nas.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* NAS audio output driver
*
@@ -53,17 +56,12 @@
#include <limits.h>
#include <audio/audiolib.h>
-#include "mp_config.h"
-
#include "audio_out.h"
#include "audio_out_internal.h"
#include "postproc/af.h"
-#include "osdep/mplib.h"
#include "afmt.h"
#include "ao_msg.h"
-using namespace mpxp;
-
/* NAS_FRAG_SIZE must be a power-of-two value */
#define NAS_FRAG_SIZE 4096
Modified: mplayerxp/libao2/ao_null.cpp
===================================================================
--- mplayerxp/libao2/ao_null.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libao2/ao_null.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
@@ -5,9 +8,7 @@
#include <limits.h>
#include <sys/time.h>
-#include "mp_config.h"
#include "osdep/bswap.h"
-#include "osdep/mplib.h"
#include "libmpstream/mrl.h"
#include "afmt.h"
@@ -15,8 +16,6 @@
#include "audio_out_internal.h"
#include "ao_msg.h"
-using namespace mpxp;
-
static ao_info_t info = {
"Null audio output",
"null",
Modified: mplayerxp/libao2/ao_openal.cpp
===================================================================
--- mplayerxp/libao2/ao_openal.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libao2/ao_openal.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* OpenAL audio output driver for MPlayerXP
*
@@ -19,9 +22,6 @@
* along with MPlayer; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-#include "mp_config.h"
-
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -34,11 +34,8 @@
#include "postproc/af.h"
#include "afmt.h"
#include "osdep/timer.h"
-#include "osdep/mplib.h"
#include "ao_msg.h"
-using namespace mpxp;
-
static const ao_info_t info =
{
"OpenAL audio output",
Modified: mplayerxp/libao2/ao_oss.cpp
===================================================================
--- mplayerxp/libao2/ao_oss.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libao2/ao_oss.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
@@ -10,17 +13,13 @@
#include <errno.h>
#include <string.h>
-#include "mp_config.h"
#include "mixer.h"
-#include "osdep/mplib.h"
#include "afmt.h"
#include "audio_out.h"
#include "audio_out_internal.h"
#include "ao_msg.h"
-using namespace mpxp;
-
static ao_info_t info =
{
"OSS/ioctl audio output",
Modified: mplayerxp/libao2/ao_sdl.cpp
===================================================================
--- mplayerxp/libao2/ao_sdl.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libao2/ao_sdl.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* ao_sdl.c - libao2 SDLlib Audio Output Driver for MPlayer
*
@@ -13,17 +16,14 @@
#include <stdio.h>
#include <stdlib.h>
+#include <SDL/SDL.h>
#include "audio_out.h"
#include "audio_out_internal.h"
#include "afmt.h"
-#include <SDL/SDL.h>
#include "osdep/fastmemcpy.h"
-#include "osdep/mplib.h"
#include "ao_msg.h"
-using namespace mpxp;
-
static ao_info_t info = {
"SDLlib audio output",
"sdl",
Modified: mplayerxp/libao2/ao_wav.cpp
===================================================================
--- mplayerxp/libao2/ao_wav.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libao2/ao_wav.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* PCM audio output driver
*
@@ -17,9 +20,6 @@
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
-#include "mp_config.h"
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -31,7 +31,6 @@
#include "audio_out.h"
#include "audio_out_internal.h"
#include "libvo/video_out.h"
-#include "osdep/mplib.h"
#include "help_mp.h"
#include "ao_msg.h"
@@ -40,8 +39,6 @@
#include <windows.h>
#endif
-using namespace mpxp;
-
static const ao_info_t info =
{
"RAW WAVE file writer audio output",
Modified: mplayerxp/libao2/audio_out.cpp
===================================================================
--- mplayerxp/libao2/audio_out.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libao2/audio_out.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -2,10 +5,6 @@
-#include "mp_config.h"
-#include "osdep/mplib.h"
#include "audio_out.h"
#include "afmt.h"
#include "ao_msg.h"
-using namespace mpxp;
-
extern const ao_functions_t audio_out_wav;
Modified: mplayerxp/libao2/mixer.cpp
===================================================================
--- mplayerxp/libao2/mixer.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libao2/mixer.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <string.h>
#include <sys/ioctl.h>
#include <fcntl.h>
@@ -4,13 +7,9 @@
#include <stdio.h>
#include <unistd.h>
-#include "mp_config.h"
#include "mixer.h"
#include "libao2/audio_out.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
void mixer_getvolume(const ao_data_t* ao, float *l,float *r )
{
ao_control_vol_t vol;
Modified: mplayerxp/libmpcodecs/ad.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
ad.c - audio decoder interface
*/
@@ -6,17 +9,12 @@
#include <stdlib.h>
#include <string.h>
-#include "mp_config.h"
-
#include "libmpstream/stream.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
#include "ad.h"
#include "ad_msg.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
/* Missed vorbis, mad, dshow */
extern const ad_functions_t mpcodecs_ad_null;
Modified: mplayerxp/libmpcodecs/ad_a52.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_a52.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#define __USE_XOPEN 1
@@ -7,12 +10,10 @@
#include "ad_internal.h"
#include "codecs_ld.h"
-#include "mp_config.h"
#include "mplayerxp.h"
#include "help_mp.h"
#include "osdep/cpudetect.h"
#include "osdep/bswap.h"
-#include "osdep/mplib.h"
#include "osdep/mm_accel.h"
#include "mplayerxp.h"
@@ -21,8 +22,6 @@
#include "libao2/audio_out.h"
#include "postproc/af.h"
-using namespace mpxp;
-
typedef struct priv_s {
float last_pts;
}priv_t;
Modified: mplayerxp/libmpcodecs/ad_acm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_acm.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,4 +1,6 @@
#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -8,12 +10,9 @@
#include "codecs_ld.h"
#include "loader/wineacm.h"
#include "libmpdemux/aviprint.h"
-#include "osdep/mplib.h"
#include "libao2/afmt.h"
#include "help_mp.h"
-using namespace mpxp;
-
static const ad_info_t info = {
"Win32/ACM decoders",
"acm",
Modified: mplayerxp/libmpcodecs/ad_dca.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_dca.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#define __USE_XOPEN 1
@@ -7,7 +10,6 @@
#include "ad_internal.h"
#include "codecs_ld.h"
-#include "mp_config.h"
#include "mplayerxp.h"
#include "help_mp.h"
#include "osdep/cpudetect.h"
@@ -19,10 +21,7 @@
#include "libao2/afmt.h"
#include "libao2/audio_out.h"
#include "postproc/af.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
#define MAX_AC5_FRAME 4096
dca_state_t* mpxp_dca_state;
Modified: mplayerxp/libmpcodecs/ad_dmo.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_dmo.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -5,15 +8,11 @@
#include "codecs_ld.h"
-#include "mp_config.h"
#include "mplayerxp.h"
#include "help_mp.h"
-#include "osdep/mplib.h"
#include "ad_internal.h"
#include "ad_msg.h"
-using namespace mpxp;
-
static const ad_info_t info = {
"Win32/DMO decoders",
"dmo",
Modified: mplayerxp/libmpcodecs/ad_dshow.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dshow.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_dshow.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -3,12 +6,8 @@
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
#include "ad_internal.h"
-#include "mp_config.h"
#include "help_mp.h"
-#include "osdep/mplib.h"
#include "loader/dshow/DS_AudioDecoder.h"
#include "codecs_ld.h"
-using namespace mpxp;
-
static const ad_info_t info = {
"Win32/DirectShow decoders",
Modified: mplayerxp/libmpcodecs/ad_dvdpcm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dvdpcm.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_dvdpcm.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -3,9 +6,6 @@
#include "ad_internal.h"
#include "osdep/bswap.h"
-#include "osdep/mplib.h"
#include "libao2/afmt.h"
-using namespace mpxp;
-
static const ad_info_t info = {
"Uncompressed DVD/VOB LPCM audio decoder",
Modified: mplayerxp/libmpcodecs/ad_faad.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_faad.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/* ad_faad.c - MPlayer AAC decoder using libfaad2
* This file is part of MPlayer, see http://mplayerhq.hu/ for info.
* (c)2002 by Felix Buenemann <atmosfear at users.sourceforge.net>
@@ -3,6 +6,4 @@
* File licensed under the GPL, see http://www.fsf.org/ for more info.
*/
-#include "mp_config.h"
-
#include <stdio.h>
#include <stdlib.h>
@@ -13,18 +14,14 @@
#include "help_mp.h"
#include "osdep/bswap.h"
#include "codecs_ld.h"
-#include "mp_config.h"
#include "ad_internal.h"
#include "mplayerxp.h"
#include "osdep/cpudetect.h"
#include "osdep/mm_accel.h"
-#include "osdep/mplib.h"
#include "libao2/afmt.h"
#include "libao2/audio_out.h"
#include "postproc/af.h"
-using namespace mpxp;
-
static const ad_info_t info = {
"AAC (MPEG2/4 Advanced Audio Coding)",
"faad",
Modified: mplayerxp/libmpcodecs/ad_hwac3.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_hwac3.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#define __USE_XOPEN 1
@@ -7,17 +10,12 @@
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
#include "ad_internal.h"
-#include "mp_config.h"
#include "help_mp.h"
#include "codecs_ld.h"
#include "osdep/cpudetect.h"
#include "osdep/bswap.h"
-#include "osdep/mplib.h"
-
#include "libao2/afmt.h"
-using namespace mpxp;
-
#define IEC61937_DATA_TYPE_AC3 1
typedef struct priv_s {
Modified: mplayerxp/libmpcodecs/ad_lavc.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_lavc.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_lavc.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#define __USE_GNU 1
@@ -8,17 +11,13 @@
#include "libao2/afmt.h"
#include "ad_internal.h"
-#include "mp_config.h"
#include "help_mp.h"
#include "osdep/bswap.h"
-#include "osdep/mplib.h"
#include "libmpconf/codec-cfg.h"
#include "mp_conf_lavc.h""
#include "codecs_ld.h"
-using namespace mpxp;
-
typedef struct priv_s {
AVCodecContext *lavc_ctx;
audio_probe_t* probe;
Modified: mplayerxp/libmpcodecs/ad_libdv.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_libdv.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -5,9 +8,7 @@
#include <unistd.h>
#include <math.h>
-#include "mp_config.h"
#include "help_mp.h"
-#include "osdep/mplib.h"
#include <libdv/dv.h>
#include <libdv/dv_types.h>
@@ -17,12 +18,8 @@
#include "libmpdemux/stheader.h"
#include "libao2/afmt.h"
#include "osdep/bswap.h"
-#include "osdep/mplib.h"
-
#include "ad_internal.h"
-using namespace mpxp;
-
static const ad_info_t info = {
"Raw DV Audio Decoder",
"libdv",
Modified: mplayerxp/libmpcodecs/ad_mp3.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_mp3.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -3,10 +6,8 @@
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
#include "ad_internal.h"
-#include "mp_config.h"
#include "mplayerxp.h"
#include "osdep/cpudetect.h"
#include "osdep/mm_accel.h"
#include "osdep/fastmemcpy.h"
-#include "osdep/mplib.h"
#include "osdep/bswap.h"
#include "codecs_ld.h"
@@ -15,8 +16,6 @@
#include "libao2/audio_out.h"
#include "postproc/af.h"
-using namespace mpxp;
-
static const ad_info_t info = {
"MPEG layer-123",
"mp3lib",
Modified: mplayerxp/libmpcodecs/ad_null.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_null.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_null.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -2,6 +5,3 @@
#include "ad_internal.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
static const ad_info_t info = {
Modified: mplayerxp/libmpcodecs/ad_pcm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_pcm.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_pcm.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -4,10 +7,7 @@
#include "ad_internal.h"
#include "libao2/afmt.h"
#include "osdep/bswap.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
static const ad_info_t info = {
"Uncompressed PCM audio decoder",
"pcm",
Modified: mplayerxp/libmpcodecs/ad_qtaudio.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_qtaudio.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -3,5 +6,4 @@
#include <inttypes.h>
#include <dlfcn.h>
-#include "mp_config.h"
#include "ad_internal.h"
@@ -10,7 +12,6 @@
#include "codecs_ld.h"
#include "mplayerxp.h"
#include "libao2/afmt.h"
-#include "osdep/mplib.h"
#ifdef WIN32_LOADER
#include "loader/ldt_keeper.h"
#endif
@@ -19,8 +20,6 @@
#include <QuickTime/QuickTimeComponents.h>
#endif
-using namespace mpxp;
-
static const ad_info_t info = {
"QuickTime Audio Decoder",
"qtaudio",
Modified: mplayerxp/libmpcodecs/ad_real.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_real.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_real.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
@@ -3,6 +6,4 @@
#include <unistd.h>
-#include "mp_config.h"
-
#include <stddef.h>
#include <dlfcn.h>
@@ -11,12 +12,9 @@
#include "ad_internal.h"
#include "codecs_ld.h"
#include "ad_msg.h"
-#include "osdep/mplib.h"
#include "osdep/bswap.h"
#include "libao2/afmt.h"
-using namespace mpxp;
-
static const ad_info_t info = {
"RealAudio decoder",
"realaudio",
Modified: mplayerxp/libmpcodecs/ad_twin.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_twin.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,4 +1,6 @@
#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -9,12 +11,8 @@
#include "loader/wine/windef.h"
#include "libao2/afmt.h"
#include "libmpdemux/aviprint.h"
-#include "osdep/mplib.h"
-
#include "help_mp.h"
-using namespace mpxp;
-
static const ad_info_t info = {
"TWinVQ decoder",
"vqf",
Modified: mplayerxp/libmpcodecs/ad_vorbis.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/ad_vorbis.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -2,14 +5,8 @@
#include <dlfcn.h>
-#include "mp_config.h"
#include "codecs_ld.h"
#include "ad_internal.h"
#include "libao2/afmt.h"
#include "libao2/audio_out.h"
-#include "osdep/mplib.h"
#include "osdep/bswap.h"
-using namespace mpxp;
-
-extern ao_data_t* ao_data;
-
static const ad_info_t info = {
Modified: mplayerxp/libmpcodecs/codecs_ld.cpp
===================================================================
--- mplayerxp/libmpcodecs/codecs_ld.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/codecs_ld.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
codecs_ld - light interface to codec loader
*/
@@ -7,14 +10,10 @@
#include <string.h>
#include <stdarg.h>
#include "codecs_ld.h"
-#include "mp_config.h"
#include "help_mp.h"
-#include "osdep/mplib.h"
#define MSGT_CLASS MSGT_GLOBAL
#include "mp_msg.h"
-using namespace mpxp;
-
any_t* ld_codec(const char *name,const char *url_hint)
{
any_t*dll_handle;
Modified: mplayerxp/libmpcodecs/dec_audio.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/dec_audio.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <algorithm>
#include <stdio.h>
@@ -4,7 +7,6 @@
#include <stdlib.h>
#include <unistd.h>
-#include "mp_config.h"
#include "help_mp.h"
#include "mplayerxp.h"
@@ -22,11 +24,8 @@
#include "libmpdemux/demuxer_r.h"
#include "postproc/af.h"
#include "osdep/fastmemcpy.h"
-#include "osdep/mplib.h"
#include "ad_msg.h"
-using namespace mpxp;
-
/* used for ac3surround decoder - set using -channels option */
af_cfg_t af_cfg; // Configuration for audio filters
Modified: mplayerxp/libmpcodecs/dec_video.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_video.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/dec_video.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,4 +1,6 @@
#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#ifdef _OPENMP
#include <omp.h>
@@ -13,7 +15,6 @@
#include "osdep/timer.h"
#include "osdep/shmem.h"
-#include "osdep/mplib.h"
#include "libmpstream/stream.h"
#include "libmpdemux/demuxer.h"
@@ -36,8 +37,6 @@
#include "osdep/cpudetect.h"
#include "vd_msg.h"
-using namespace mpxp;
-
// ===================================================================
vf_cfg_t vf_cfg; // Configuration for audio filters
@@ -95,7 +94,6 @@
}
#include "libvo/video_out.h"
-extern vo_data_t*vo_data;
#define MPDEC_THREAD_COND (VF_FLAGS_THREADS|VF_FLAGS_SLICES)
static unsigned smp_num_cpus=1;
static unsigned use_vf_threads=0;
@@ -280,7 +278,6 @@
}
}
-extern vo_data_t* vo_data;
static void update_subtitle(sh_video_t *sh_video,float v_pts,unsigned idx);
int mpcv_decode(any_t *opaque,const enc_frame_t* frame){
priv_t* priv=(priv_t*)opaque;
@@ -404,9 +401,6 @@
#include "libvo/video_out.h"
-extern vo_data_t* vo_data;
-extern const vd_functions_t* mpvdec; // FIXME!
-
MPXP_Rc mpcodecs_config_vo(sh_video_t *sh, int w, int h, any_t* libinput){
priv_t* priv=(priv_t*)sh->decoder;
int i,j;
@@ -443,7 +437,7 @@
// check (query) if codec really support this outfmt...
sh->outfmtidx=j; // pass index to the control() function this way
if(priv->mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)==MPXP_False) {
- MSG_DBG2("vo_debug: codec[%s] query_format(%s) returned FALSE\n",mpvdec->info->driver_name,vo_format_name(out_fmt));
+ MSG_DBG2("vo_debug: codec[%s] query_format(%s) returned FALSE\n",priv->mpvdec->info->driver_name,vo_format_name(out_fmt));
continue;
}
j=i;
Modified: mplayerxp/libmpcodecs/liba52/bit_allocate.cpp
===================================================================
--- mplayerxp/libmpcodecs/liba52/bit_allocate.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/liba52/bit_allocate.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* bit_allocate.c
* Copyright (C) 2000-2002 Michel Lespinasse <wa...@zo...>
@@ -20,17 +23,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-#include "mp_config.h"
-
#include <inttypes.h>
#include "a52.h"
#include "a52_internal.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
static int hthtab[3][50] = {
{0x730, 0x730, 0x7c0, 0x800, 0x820, 0x840, 0x850, 0x850, 0x860, 0x860,
0x860, 0x860, 0x860, 0x870, 0x870, 0x870, 0x880, 0x880, 0x890, 0x890,
Modified: mplayerxp/libmpcodecs/liba52/bitstream.cpp
===================================================================
--- mplayerxp/libmpcodecs/liba52/bitstream.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/liba52/bitstream.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* bitstream.c
* Copyright (C) 2000-2002 Michel Lespinasse <wa...@zo...>
@@ -20,18 +23,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-#include "mp_config.h"
-
#include <inttypes.h>
#include "a52.h"
#include "a52_internal.h"
#include "bitstream.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
#define BUFFER_SIZE 4096
void a52_bitstream_set_ptr (a52_state_t * state, uint8_t * buf)
Modified: mplayerxp/libmpcodecs/liba52/crc.cpp
===================================================================
--- mplayerxp/libmpcodecs/liba52/crc.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/liba52/crc.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* crc.c
*
@@ -25,11 +28,6 @@
#include <stdio.h>
#include <inttypes.h>
-#include "mp_config.h"
-#include "osdep/mplib.h"
-
-using namespace mpxp;
-
static const uint16_t crc_lut[256] =
{
0x0000,0x8005,0x800f,0x000a,0x801b,0x001e,0x0014,0x8011,
Modified: mplayerxp/libmpcodecs/liba52/downmix.cpp
===================================================================
--- mplayerxp/libmpcodecs/liba52/downmix.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/liba52/downmix.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* downmix.c
* Copyright (C) 2000-2002 Michel Lespinasse <wa...@zo...>
@@ -20,9 +23,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-#include "mp_config.h"
-
#include <string.h>
#include <inttypes.h>
@@ -30,10 +30,7 @@
#include "a52_internal.h"
#include "osdep/mm_accel.h"
#include "osdep/cpudetect.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
#define CONVERT(acmod,output) (((output) << 3) + (acmod))
extern uint32_t a52_accel;
Modified: mplayerxp/libmpcodecs/liba52/imdct.cpp
===================================================================
--- mplayerxp/libmpcodecs/liba52/imdct.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/liba52/imdct.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* imdct.c
* Copyright (C) 2000-2002 Michel Lespinasse <wa...@zo...>
@@ -23,9 +26,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-#include "mp_config.h"
-
#include <math.h>
#include <stdio.h>
#ifndef M_PI
@@ -36,10 +36,7 @@
#include "a52.h"
#include "a52_internal.h"
#include "osdep/mm_accel.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
typedef struct complex_s {
sample_t real;
sample_t imag;
Modified: mplayerxp/libmpcodecs/liba52/parse.cpp
===================================================================
--- mplayerxp/libmpcodecs/liba52/parse.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/liba52/parse.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* parse.c
* Copyright (C) 2000-2002 Michel Lespinasse <wa...@zo...>
@@ -21,22 +24,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "mp_config.h"
-
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <inttypes.h>
-#include "osdep/mplib.h"
-
#include "a52.h"
#include "a52_internal.h"
#include "bitstream.h"
#include "tables.h"
-using namespace mpxp;
-
typedef struct {
sample_t q1[2];
sample_t q2[2];
Modified: mplayerxp/libmpcodecs/liba52/resample.cpp
===================================================================
--- mplayerxp/libmpcodecs/liba52/resample.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/liba52/resample.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
// a52_resample_init should find the requested converter (from type flags ->
// given number of channels) and set up some function pointers...
@@ -4,7 +7,6 @@
// a52_resample() should do the conversion.
-#include "mp_config.h"
#include <inttypes.h>
#include <stdio.h>
#include "a52.h"
@@ -12,10 +14,7 @@
#include "osdep/mm_accel.h"
#include "osdep/mangle.h"
#include "osdep/cpudetect.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
int (* a52_resample) (float * _f, int16_t * s16)=NULL;
int (* a52_resample32) (float * _f, float * s16)=NULL;
Modified: mplayerxp/libmpcodecs/libdca/bitstream.cpp
===================================================================
--- mplayerxp/libmpcodecs/libdca/bitstream.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/libdca/bitstream.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* bitstream.c
* Copyright (C) 2004 Gildas Bazin <gb...@vi...>
@@ -21,18 +24,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-#include "mp_config.h"
-
#include <inttypes.h>
#include "dca.h"
#include "dca_internal.h"
#include "bitstream.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
#define BUFFER_SIZE 4096
void dca_bitstream_init (dca_state_t * state, uint8_t * buf, int word_mode,
Modified: mplayerxp/libmpcodecs/libdca/downmix.cpp
===================================================================
--- mplayerxp/libmpcodecs/libdca/downmix.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/libdca/downmix.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* downmix.c
* Copyright (C) 2004 Gildas Bazin <gb...@vi...>
@@ -21,19 +24,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-#include "mp_config.h"
-
#include <string.h>
#include <inttypes.h>
#include "osdep/cpudetect.h"
-#include "osdep/mplib.h"
#include "dca.h"
#include "dca_internal.h"
-using namespace mpxp;
-
#define CONVERT(acmod,output) (((output) << DCA_CHANNEL_BITS) + (acmod))
int dca_downmix_init (int input, int flags, level_t * level,
Modified: mplayerxp/libmpcodecs/libdca/parse.cpp
===================================================================
--- mplayerxp/libmpcodecs/libdca/parse.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/libdca/parse.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* parse.c
* Copyright (C) 2004 Gildas Bazin <gb...@vi...>
@@ -19,9 +22,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
-#include "mp_config.h"
-
#include <stdio.h>
#include <stdlib.h>
@@ -29,8 +29,6 @@
#include <inttypes.h>
#include <math.h>
-#include "osdep/mplib.h"
-
#ifndef M_PI
#define M_PI 3.1415926535897932384626433832795029
#endif
@@ -46,8 +44,6 @@
#include "tables_fir.h"
#include "tables_vq.h"
-using namespace mpxp;
-
//#define LOG_DEBUG 1
static int decode_blockcode (int code, int levels, int *values);
Modified: mplayerxp/libmpcodecs/libdca/resample.cpp
===================================================================
--- mplayerxp/libmpcodecs/libdca/resample.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/libdca/resample.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
// dca_resample_init should find the requested converter (from type flags ->
// given number of channels) and set up some function pointers...
@@ -8,14 +11,10 @@
#include <stdio.h>
#include "dca.h"
#include "dca_internal.h"
-#include "mp_config.h"
#include "osdep/mm_accel.h"
#include "osdep/mangle.h"
#include "osdep/cpudetect.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
int (* dca_resample) (float * _f, int16_t * s16)=NULL;
int (* dca_resample32) (float * _f, float * s16)=NULL;
Modified: mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.cpp
===================================================================
--- mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
RTjpeg (C) Justin Schoeman 1998 (ju...@su...)
@@ -26,11 +29,7 @@
#include <string.h>
#include "RTjpegN.h"
-#include "mp_config.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
//#define SHOWBLOCK 1
#define BETTERCOMPRESSION 1
Modified: mplayerxp/libmpcodecs/libnuppelvideo/minilzo.cpp
===================================================================
--- mplayerxp/libmpcodecs/libnuppelvideo/minilzo.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/libnuppelvideo/minilzo.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/* minilzo.c -- mini subset of the LZO real-time data compression library
This file is part of the LZO real-time data compression library.
@@ -57,10 +60,7 @@
#include <stdio.h>
#include "osdep/cpudetect.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
#ifndef __LZO_CONF_H
#define __LZO_CONF_H
Modified: mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.cpp
===================================================================
--- mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
* NuppelVideo 0.05 file parser
* for MPlayer
@@ -11,11 +14,6 @@
#include <string.h>
#include <unistd.h>
-#include "mp_config.h"
-#include "osdep/mplib.h"
-
-using namespace mpxp;
-
#include "nuppelvideo.h"
#include "RTjpegN.h"
#include "minilzo.h"
Modified: mplayerxp/libmpcodecs/vd.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/vd.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -2,3 +5,2 @@
-#include "mp_config.h"
#include "help_mp.h"
@@ -13,13 +15,10 @@
#include "libmpstream/stream.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
-#include "osdep/mplib.h"
#include "vd.h"
#include "postproc/vf.h"
#include "vd_msg.h"
-using namespace mpxp;
-
extern const vd_functions_t mpcodecs_vd_null;
extern const vd_functions_t mpcodecs_vd_lavc;
extern const vd_functions_t mpcodecs_vd_dshow;
Modified: mplayerxp/libmpcodecs/vd_divx4.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_divx4.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/vd_divx4.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
HACKING notes:
first time it was OpenDivx project by Mayo (unsupported by mplayerxp)
@@ -12,7 +15,6 @@
#include <stdarg.h>
#include <assert.h>
-#include "mp_config.h"
#include "help_mp.h"
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
@@ -21,11 +23,8 @@
#include "vd.h"
#include "codecs_ld.h"
#include "libvo/video_out.h"
-#include "osdep/mplib.h"
#include "osdep/bswap.h"
-using namespace mpxp;
-
static const vd_info_t info = {
"DivX4Linux lib (divx4/5 mode)",
"divx4",
Modified: mplayerxp/libmpcodecs/vd_dmo.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_dmo.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/vd_dmo.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@@ -2,4 +5,2 @@
-#include "mp_config.h"
-
#include "help_mp.h"
@@ -10,13 +11,9 @@
#include "vd_internal.h"
#include "codecs_ld.h"
-#include "osdep/mplib.h"
-
#include "loader/dmo/DMO_VideoDecoder.h"
#include "vd_msg.h"
-using namespace mpxp;
-
static const vd_info_t info = {
"Win32/DMO video codecs",
"dmo",
Modified: mplayerxp/libmpcodecs/vd_dshow.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_dshow.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/vd_dshow.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@@ -2,3 +5,2 @@
-#include "mp_config.h"
#include "mplayerxp.h"
@@ -13,10 +15,7 @@
#include "loader/dshow/DS_VideoDecoder.h"
#include "codecs_ld.h"
#include "osdep/bswap.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-
static const vd_info_t info = {
"Win32/DirectShow video codecs",
"dshow",
Modified: mplayerxp/libmpcodecs/vd_huffyuv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_huffyuv.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/vd_huffyuv.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
/*
*
* HuffYUV Decoder for Mplayer
@@ -20,15 +23,10 @@
#include <stdio.h>
#include <stdlib.h>
-#include "mp_config.h"
-
#include "vd_internal.h"
#include "help_mp.h"
-#include "osdep/mplib.h"
#include "osdep/bswap.h"
-using namespace mpxp;
-
static const vd_info_t info = {
"HuffYUV Video decoder",
"huffyuv",
Modified: mplayerxp/libmpcodecs/vd_lavc.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_lavc.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/vd_lavc.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <algorithm>
#include <ctype.h>
@@ -6,7 +9,6 @@
#include <assert.h>
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
-#include "mp_config.h"
#include "mplayerxp.h"
#include "xmpcore/xmp_core.h"
#ifdef HAVE_GOMP
@@ -16,7 +18,6 @@
#include "help_mp.h"
#include "osdep/bswap.h"
-#include "osdep/mplib.h"
#include "vd_internal.h"
#include "codecs_ld.h"
@@ -25,8 +26,6 @@
#include "libvo/video_out.h"
#include "osdep/bswap.h"
-using namespace mpxp;
-
static const vd_info_t info = {
"lavc codec family",
"lavc",
@@ -244,7 +243,6 @@
return MPXP_False;
}
-extern unsigned xp_num_cpu;
static MPXP_Rc init(sh_video_t *sh,any_t* libinput){
unsigned avc_version=0;
priv_t *priv = reinterpret_cast<priv_t*>(sh->context);
@@ -390,7 +388,7 @@
if(priv->lavc_codec->capabilities&CODEC_CAP_DR1) priv->cap_dr1=1;
priv->ctx->flags|= CODEC_FLAG_EMU_EDGE;
- if(lavc_param_threads < 0) lavc_param_threads = xp_num_cpu;
+ if(lavc_param_threads < 0) lavc_param_threads = get_number_cpu();
if(lavc_param_threads > 1) {
priv->ctx->thread_count = lavc_param_threads;
MSG_STATUS("Using %i threads in lavc\n",lavc_param_threads);
Modified: mplayerxp/libmpcodecs/vd_libdv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_libdv.cpp 2012-11-23 12:04:19 UTC (rev 442)
+++ mplayerxp/libmpcodecs/vd_libdv.cpp 2012-11-23 16:09:06 UTC (rev 443)
@@ -1,3 +1,6 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -5,11 +8,8 @@
#include <unistd.h>
#include <math.h>
-#include "mp_config.h"
-
#include "libvo/img_format.h"
#include "osdep/bswap.h"
-#include "osdep/mplib.h"
#include <libdv/dv.h>
#include <libdv/dv_types.h>
@@ -20,8 +20,6 @@
#include "vd_internal.h"
-using namespace mpxp;
-
static const vd_info_t info = {
"Raw DV Video D...
[truncated message content] |
