[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[432] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[432] mplayerxp
|
From: <nic...@us...> - 2012-11-22 15:30:05
|
Revision: 432
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=432&view=rev
Author: nickols_k
Date: 2012-11-22 15:29:45 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
minor fixes + using namespace mpxp;
Modified Paths:
--------------
mplayerxp/configure
mplayerxp/dump.cpp
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_ffmpeg.cpp
mplayerxp/libmpcodecs/ad_hwac3.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_ffmpeg.cpp
mplayerxp/libmpcodecs/vd_huffyuv.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_ffmpeg.cpp
mplayerxp/libmpstream/s_file.cpp
mplayerxp/libmpstream/s_ftp.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/asxparser.h
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/cpudetect.cpp
mplayerxp/osdep/get_path.cpp
mplayerxp/osdep/getch2.cpp
mplayerxp/osdep/lrmi.cpp
mplayerxp/osdep/mp_malloc.cpp
mplayerxp/osdep/mplib.cpp
mplayerxp/osdep/mplib.h
mplayerxp/osdep/shmem.cpp
mplayerxp/osdep/timer-lx.cpp
mplayerxp/osdep/timer.cpp
mplayerxp/osdep/vbelib.cpp
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/mp_aframe.cpp
mplayerxp/xmpcore/mp_image.cpp
mplayerxp/xmpcore/sig_hand.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/configure
===================================================================
--- mplayerxp/configure 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/configure 2012-11-22 15:29:45 UTC (rev 432)
@@ -577,7 +577,6 @@
enabled gpl_only && disable win32loader
-enable win32loader
if win32 || ! x86_32 ; then
disable win32loader
fi
Modified: mplayerxp/dump.cpp
===================================================================
--- mplayerxp/dump.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/dump.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -18,9 +18,10 @@
#include "osdep/mplib.h"
#define MSGT_CLASS MSGT_GLOBAL
#include "mp_msg.h"
-
#include "dump.h"
+using namespace mpxp;
+
static char *media=NULL,*port=NULL;
/* example: -dump @avi:my_file.avi#rate=50 */
Modified: mplayerxp/input2/input.cpp
===================================================================
--- mplayerxp/input2/input.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/input2/input.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -33,6 +33,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/input2/joystick.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -14,6 +14,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/input2/lirc.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -15,6 +15,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libao2/afmt.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -1,5 +1,8 @@
#include "afmt.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
+
const char* afmt2str(unsigned fmt) {
const char* rs = "AFMT_Unknown";
switch (fmt) {
Modified: mplayerxp/libao2/ao_alsa9.cpp
===================================================================
--- mplayerxp/libao2/ao_alsa9.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libao2/ao_alsa9.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -30,6 +30,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libao2/ao_arts.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -30,6 +30,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libao2/ao_esd.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -55,6 +55,7 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libao2/ao_jack.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -39,6 +39,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libao2/ao_nas.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -62,6 +62,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libao2/ao_null.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -15,6 +15,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libao2/ao_openal.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -37,6 +37,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libao2/ao_oss.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -19,6 +19,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libao2/ao_sdl.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -21,6 +21,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libao2/ao_wav.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -40,6 +40,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libao2/audio_out.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -8,6 +8,8 @@
#include "afmt.h"
#include "ao_msg.h"
+using namespace mpxp;
+
extern const ao_functions_t audio_out_wav;
extern const ao_functions_t audio_out_null;
#ifdef USE_OSS_AUDIO
Modified: mplayerxp/libao2/mixer.cpp
===================================================================
--- mplayerxp/libao2/mixer.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libao2/mixer.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -7,7 +7,10 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -13,7 +13,10 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_a52.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -11,6 +11,8 @@
#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"
@@ -19,6 +21,8 @@
#include "libao2/audio_out.h"
#include "postproc/af.h"
+using namespace mpxp;
+
typedef struct priv_s {
float last_pts;
}priv_t;
@@ -29,9 +33,6 @@
uint32_t mpxp_a52_accel=0;
uint32_t mpxp_a52_flags=0;
-#include "osdep/bswap.h"
-#include "osdep/mplib.h"
-
static const ad_info_t info =
{
"liba52 AC3 driver",
Modified: mplayerxp/libmpcodecs/ad_acm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_acm.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -12,6 +12,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_dca.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -21,6 +21,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_dmo.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -12,6 +12,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_dshow.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -9,6 +9,8 @@
#include "loader/dshow/DS_AudioDecoder.h"
#include "codecs_ld.h"
+using namespace mpxp;
+
static const ad_info_t info = {
"Win32/DirectShow decoders",
"dshow",
Modified: mplayerxp/libmpcodecs/ad_dvdpcm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dvdpcm.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_dvdpcm.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -3,8 +3,11 @@
#include <unistd.h>
#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",
"dvdpcm",
Modified: mplayerxp/libmpcodecs/ad_faad.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_faad.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -23,6 +23,8 @@
#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_ffmpeg.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_ffmpeg.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_ffmpeg.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -17,6 +17,8 @@
#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_hwac3.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_hwac3.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -12,9 +12,12 @@
#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_libdv.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_libdv.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -17,9 +17,12 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_mp3.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -15,6 +15,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_null.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -2,7 +2,10 @@
#include <stdlib.h>
#include <unistd.h>
#include "ad_internal.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
+
static const ad_info_t info = {
"Null audio decoder",
"null",
Modified: mplayerxp/libmpcodecs/ad_pcm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_pcm.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_pcm.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -4,7 +4,10 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_qtaudio.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -10,6 +10,7 @@
#include "codecs_ld.h"
#include "mplayerxp.h"
#include "libao2/afmt.h"
+#include "osdep/mplib.h"
#ifdef WIN32_LOADER
#include "loader/ldt_keeper.h"
#endif
@@ -18,6 +19,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_real.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -14,6 +14,9 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_twin.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -13,6 +13,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/ad_vorbis.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -10,6 +10,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/codecs_ld.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -9,9 +9,12 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/dec_audio.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -25,6 +25,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/dec_video.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -36,6 +36,8 @@
#include "osdep/cpudetect.h"
#include "vd_msg.h"
+using namespace mpxp;
+
// ===================================================================
vf_cfg_t vf_cfg; // Configuration for audio filters
Modified: mplayerxp/libmpcodecs/liba52/bit_allocate.cpp
===================================================================
--- mplayerxp/libmpcodecs/liba52/bit_allocate.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/liba52/bit_allocate.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -21,13 +21,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../../mp_config.h"
+#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/liba52/bitstream.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -21,14 +21,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../../mp_config.h"
+#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/liba52/crc.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -25,6 +25,11 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/liba52/downmix.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -30,7 +30,10 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/liba52/imdct.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -36,7 +36,10 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/liba52/parse.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -35,6 +35,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/liba52/resample.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -12,7 +12,10 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/libdca/bitstream.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -22,14 +22,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../../mp_config.h"
+#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/libdca/downmix.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -28,9 +28,12 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/libdca/parse.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -46,7 +46,7 @@
#include "tables_fir.h"
#include "tables_vq.h"
-/* #define LOG_DEBUG */
+using namespace mpxp;
//#define LOG_DEBUG 1
Modified: mplayerxp/libmpcodecs/libdca/resample.cpp
===================================================================
--- mplayerxp/libmpcodecs/libdca/resample.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/libdca/resample.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -12,7 +12,10 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -29,6 +29,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/libnuppelvideo/minilzo.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -57,7 +57,10 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -14,7 +14,7 @@
#include "mp_config.h"
#include "osdep/mplib.h"
-//#include "fastmemcpy.h"
+using namespace mpxp;
#include "nuppelvideo.h"
#include "RTjpegN.h"
Modified: mplayerxp/libmpcodecs/vd.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -18,6 +18,8 @@
#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_ffmpeg;
extern const vd_functions_t mpcodecs_vd_dshow;
Modified: mplayerxp/libmpcodecs/vd_divx4.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_divx4.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_divx4.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -24,6 +24,8 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_dmo.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -10,10 +10,13 @@
#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-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_dshow.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -13,7 +13,10 @@
#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_ffmpeg.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_ffmpeg.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_ffmpeg.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -25,6 +25,8 @@
#include "libvo/video_out.h"
#include "osdep/bswap.h"
+using namespace mpxp;
+
static const vd_info_t info = {
"FFmpeg's libavcodec codec family",
"ffmpeg",
Modified: mplayerxp/libmpcodecs/vd_huffyuv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_huffyuv.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_huffyuv.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -27,6 +27,8 @@
#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_libdv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_libdv.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_libdv.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -9,6 +9,7 @@
#include "libvo/img_format.h"
#include "osdep/bswap.h"
+#include "osdep/mplib.h"
#include <libdv/dv.h>
#include <libdv/dv_types.h>
@@ -19,6 +20,8 @@
#include "vd_internal.h"
+using namespace mpxp;
+
static const vd_info_t info = {
"Raw DV Video Decoder",
"libdv",
Modified: mplayerxp/libmpcodecs/vd_libmpeg2.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_libmpeg2.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_libmpeg2.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -20,6 +20,8 @@
#include "osdep/mplib.h"
#include "osdep/bswap.h"
+using namespace mpxp;
+
static const vd_info_t info = {
"libmpeg2 MPEG 1/2 Video decoder",
"libmpeg2",
Modified: mplayerxp/libmpcodecs/vd_mpegpes.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_mpegpes.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_mpegpes.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -4,7 +4,10 @@
#include "mp_config.h"
#include "vd_internal.h"
#include "osdep/bswap.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
+
static const vd_info_t info = {
"MPEG 1/2 Video passthrough",
"mpegpes",
Modified: mplayerxp/libmpcodecs/vd_null.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_null.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_null.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -2,9 +2,11 @@
#include <stdlib.h>
#include "mp_config.h"
-
+#include "osdep/mplib.h"
#include "vd_internal.h"
+using namespace mpxp;
+
static const vd_info_t info = {
"Null video decoder",
"null",
Modified: mplayerxp/libmpcodecs/vd_nuv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_nuv.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_nuv.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -5,7 +5,10 @@
#include "vd_internal.h"
#include "codecs_ld.h"
#include "osdep/bswap.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
+
static const vd_info_t info = {
"NuppelVideo decoder",
"nuv",
Modified: mplayerxp/libmpcodecs/vd_qtvideo.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_qtvideo.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_qtvideo.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -14,8 +14,11 @@
#include "loader/ldt_keeper.h"
#endif
#include "codecs_ld.h"
+#include "osdep/mplib.h"
#include "vd_msg.h"
+using namespace mpxp;
+
static const vd_info_t info = {
"Quicktime Video decoder",
"qtvideo",
Modified: mplayerxp/libmpcodecs/vd_raw.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_raw.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_raw.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -4,7 +4,10 @@
#include "mp_config.h"
#include "vd_internal.h"
#include "osdep/bswap.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
+
static const vd_info_t info = {
"RAW Uncompressed Video",
"raw",
Modified: mplayerxp/libmpcodecs/vd_real.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_real.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_real.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -12,6 +12,8 @@
#include "osdep/mplib.h"
#include "osdep/bswap.h"
+using namespace mpxp;
+
static const vd_info_t info = {
"RealPlayer video codecs",
"realvid",
Modified: mplayerxp/libmpcodecs/vd_theora.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_theora.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_theora.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -15,6 +15,8 @@
#include "osdep/mplib.h"
#include "osdep/bswap.h"
+using namespace mpxp;
+
static const vd_info_t info = {
"Theora/VP3 video decoder",
"theora",
Modified: mplayerxp/libmpcodecs/vd_vfw.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_vfw.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_vfw.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -14,6 +14,8 @@
#include "loader/wine/driver.h"
#include "libmpdemux/aviprint.h"
+using namespace mpxp;
+
static const vd_info_t info_vfw = {
"Win32/VfW video codecs",
"vfw",
Modified: mplayerxp/libmpcodecs/vd_xanim.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_xanim.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_xanim.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -26,6 +26,8 @@
#include "vd_internal.h"
#include "codecs_ld.h"
+using namespace mpxp;
+
static const vd_info_t info = {
"XAnim codecs",
"xanim",
Modified: mplayerxp/libmpcodecs/vd_xvid.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_xvid.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpcodecs/vd_xvid.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -18,6 +18,8 @@
#include "osdep/mplib.h"
#include "osdep/bswap.h"
+using namespace mpxp;
+
static const vd_info_t info = {
"XviD MPEG4 codec ",
"xvid",
Modified: mplayerxp/libmpconf/cfgparser.cpp
===================================================================
--- mplayerxp/libmpconf/cfgparser.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpconf/cfgparser.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -18,6 +18,8 @@
#include "mp_config.h"
#include "osdep/mplib.h"
+using namespace mpxp;
+
#define COMMAND_LINE 0
#define CONFIG_FILE 1
Modified: mplayerxp/libmpconf/codec-cfg.cpp
===================================================================
--- mplayerxp/libmpconf/codec-cfg.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpconf/codec-cfg.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -26,6 +26,8 @@
#define MSGT_CLASS MSGT_CODECCFG
#include "mp_msg.h"
+using namespace mpxp;
+
#define MAX_NR_TOKEN 16
#define MAX_LINE_LEN 1000
Modified: mplayerxp/libmpconf/m_option.cpp
===================================================================
--- mplayerxp/libmpconf/m_option.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpconf/m_option.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -19,6 +19,8 @@
#define MSGT_CLASS MSGT_CPLAYER
#include "mp_msg.h"
+using namespace mpxp;
+
// Don't mp_free for 'production' atm
#ifndef MP_DEBUG
//#define NO_FREE
Modified: mplayerxp/libmpconf/m_property.cpp
===================================================================
--- mplayerxp/libmpconf/m_property.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpconf/m_property.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -17,6 +17,8 @@
#define MSGT_CLASS MSGT_CPLAYER
#include "mp_msg.h"
+using namespace mpxp;
+
#define ROUND(x) ((int)((x)<0 ? (x)-0.5 : (x)+0.5))
static int do_action(m_option_t* prop_list, const char* name,
Modified: mplayerxp/libmpconf/m_struct.cpp
===================================================================
--- mplayerxp/libmpconf/m_struct.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpconf/m_struct.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -13,6 +13,8 @@
#define MSGT_CLASS MSGT_CPLAYER
#include "mp_msg.h"
+using namespace mpxp;
+
const m_option_t*
m_struct_get_field(const m_struct_t* st,const char* f) {
int i;
Modified: mplayerxp/libmpconf/subopt-helper.cpp
===================================================================
--- mplayerxp/libmpconf/subopt-helper.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpconf/subopt-helper.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -26,6 +26,7 @@
#define MSGT_CLASS MSGT_GLOBAL
#include "mp_msg.h"
+using namespace mpxp;
#ifndef MP_DEBUG
#define NDEBUG
Modified: mplayerxp/libmpdemux/aviprint.cpp
===================================================================
--- mplayerxp/libmpdemux/aviprint.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/aviprint.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -3,13 +3,16 @@
#include <stdlib.h>
#include <unistd.h>
-#include "../mp_config.h"
+#include "mp_config.h"
#include "libmpstream/stream.h"
#include "demuxer.h"
#include "aviprint.h"
#include "demux_msg.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
+
extern int avi_stream_id(unsigned int id);
void print_avih_flags(MainAVIHeader *h){
Modified: mplayerxp/libmpdemux/demux_aiff.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_aiff.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_aiff.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -13,6 +13,8 @@
#include "osdep/mplib.h"
#include "demux_msg.h"
+using namespace mpxp;
+
static unsigned long cvt_extended(const char * buf)
{
unsigned long mantissa,last=0;
Modified: mplayerxp/libmpdemux/demux_asf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_asf.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_asf.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -16,6 +16,9 @@
#include "aviprint.h"
#include "demux_msg.h"
#include "osdep/mplib.h"
+
+using namespace mpxp;
+
/*
* Load 16/32-bit values in little endian byte order
* from an unaligned address
Modified: mplayerxp/libmpdemux/demux_audio.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_audio.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_audio.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -21,6 +21,8 @@
#include "demux_msg.h"
#include "osdep/mplib.h"
+using namespace mpxp;
+
#define RAW_MP1 1
#define RAW_MP2 2
#define RAW_MP3 3
Modified: mplayerxp/libmpdemux/demux_avi.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_avi.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_avi.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -19,6 +19,8 @@
#include "aviprint.h"
#include "demux_msg.h"
+using namespace mpxp;
+
typedef int (*alt_demuxer_t)(demuxer_t *demux,demux_stream_t *__ds);
typedef struct {
// index stuff:
Modified: mplayerxp/libmpdemux/demux_bmp.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_bmp.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_bmp.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -22,6 +22,8 @@
#ifdef HAVE_SDL_IMAGE
#include <SDL/SDL_image.h>
+using namespace mpxp;
+
static int demux_rw_seek(struct SDL_RWops *context, int offset, int whence)
{
unsigned long newpos=-1;
Modified: mplayerxp/libmpdemux/demux_demuxers.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_demuxers.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_demuxers.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -7,6 +7,9 @@
#include "stheader.h"
#include "demux_msg.h"
#include "osdep/mplib.h"
+
+using namespace mpxp;
+
typedef struct dd_priv {
demuxer_t* vd;
demuxer_t* ad;
Modified: mplayerxp/libmpdemux/demux_dv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_dv.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_dv.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -36,6 +36,8 @@
#include <libdv/dv.h>
#include <libdv/dv_types.h>
+using namespace mpxp;
+
#define DV_PAL_FRAME_SIZE 144000
#define DV_NTSC_FRAME_SIZE 122000
Modified: mplayerxp/libmpdemux/demux_film.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_film.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_film.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -26,6 +26,8 @@
#include "stheader.h"
#include "demux_msg.h"
+using namespace mpxp;
+
// chunk types found in a FILM file
#define CHUNK_FILM mmioFOURCC('F', 'I', 'L', 'M')
#define CHUNK_FDSC mmioFOURCC('F', 'D', 'S', 'C')
Modified: mplayerxp/libmpdemux/demux_fli.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_fli.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_fli.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -19,6 +19,8 @@
#include "demux_msg.h"
#include "osdep/mplib.h"
+using namespace mpxp;
+
typedef struct _fli_frames_t {
int num_frames;
int current_frame;
Modified: mplayerxp/libmpdemux/demux_lavf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_lavf.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_lavf.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -33,6 +33,8 @@
#include "demux_msg.h"
#include "osdep/mplib.h"
+using namespace mpxp;
+
#define PROBE_BUF_SIZE 2048
#define BIO_BUFFER_SIZE 32768
Modified: mplayerxp/libmpdemux/demux_mkv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_mkv.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -43,6 +43,8 @@
#include "loader/qtx/qtxsdk/components.h"
#include "demux_msg.h"
+using namespace mpxp;
+
enum {
LZO_INPUT_DEPLETED=1,
LZO_OUTPUT_FULL=2,
Modified: mplayerxp/libmpdemux/demux_mov.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mov.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_mov.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -50,6 +50,8 @@
#include <fcntl.h>
#endif
+using namespace mpxp;
+
#define BE_16(x) be2me_16(x)
#define BE_32(x) be2me_32(x)
Modified: mplayerxp/libmpdemux/demux_mpg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpg.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_mpg.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -24,6 +24,9 @@
#include "libmpcodecs/dec_audio.h"
#include "demux_msg.h"
#include "osdep/mplib.h"
+
+using namespace mpxp;
+
//#define MAX_PS_PACKETSIZE 2048
#define MAX_PS_PACKETSIZE (224*1024)
Modified: mplayerxp/libmpdemux/demux_mpxp64.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_mpxp64.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -27,6 +27,8 @@
#include "demux_msg.h"
#include "osdep/mplib.h"
+using namespace mpxp;
+
#define MAX_AV_STREAMS MAX_V_STREAMS+MAX_A_STREAMS+MAX_S_STREAMS
typedef struct {
Modified: mplayerxp/libmpdemux/demux_nsv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_nsv.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_nsv.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -23,6 +23,8 @@
#include "demux_msg.h"
#include "osdep/mplib.h"
+using namespace mpxp;
+
typedef struct {
float v_pts;
int video_pack_no;
Modified: mplayerxp/libmpdemux/demux_null.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_null.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_null.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -7,7 +7,10 @@
#include "demuxer.h"
#include "stheader.h"
#include "libmpconf/cfgparser.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
+
static const config_t demux_null_opts[] = {
{NULL, NULL, 0, 0, 0, 0, NULL}
};
Modified: mplayerxp/libmpdemux/demux_nuv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_nuv.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_nuv.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -23,6 +23,7 @@
#include "demux_msg.h"
#include "osdep/mplib.h"
+using namespace mpxp;
struct nuv_signature
{
Modified: mplayerxp/libmpdemux/demux_ogg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ogg.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_ogg.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -28,6 +28,8 @@
#include "demux_msg.h"
#include "osdep/mplib.h"
+using namespace mpxp;
+
#define BLOCK_SIZE 4096
#define FOURCC_VORBIS mmioFOURCC('v', 'r', 'b', 's')
#define FOURCC_THEORA mmioFOURCC('t', 'h', 'e', 'o')
Modified: mplayerxp/libmpdemux/demux_pva.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_pva.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_pva.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -37,6 +37,8 @@
#include "demux_msg.h"
#include "osdep/mplib.h"
+using namespace mpxp;
+
/*
* #defines below taken from PVA spec (see URL above)
*/
Modified: mplayerxp/libmpdemux/demux_ra.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ra.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_ra.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -20,6 +20,8 @@
#include "aviprint.h"
#include "demux_msg.h"
+using namespace mpxp;
+
#define FOURCC_DOTRA mmioFOURCC('.','r','a', 0xfd)
#define FOURCC_144 mmioFOURCC('1','4','_','4')
#define FOURCC_288 mmioFOURCC('2','8','_','8')
Modified: mplayerxp/libmpdemux/demux_rawaudio.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_rawaudio.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_rawaudio.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -13,6 +13,8 @@
#include "osdep/mplib.h"
#include "aviprint.h"
+using namespace mpxp;
+
int use_rawaudio = 0;
static int channels = 2;
static int samplerate = 44100;
Modified: mplayerxp/libmpdemux/demux_rawvideo.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_rawvideo.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_rawvideo.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -5,7 +5,6 @@
#include <unistd.h>
#include <string.h>
-
#include "libmpstream/stream.h"
#include "demuxer.h"
#include "stheader.h"
@@ -14,6 +13,8 @@
#include "libvo/img_format.h"
#include "demux_msg.h"
+using namespace mpxp;
+
typedef struct priv_s {
int use_rawvideo;
int format;
Modified: mplayerxp/libmpdemux/demux_real.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_real.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_real.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -36,6 +36,8 @@
#include "libao2/afmt.h"
#include "demux_msg.h"
+using namespace mpxp;
+
#define MKTAG(a, b, c, d) (a | (b << 8) | (c << 16) | (d << 24))
#define MAX_STREAMS 32
Modified: mplayerxp/libmpdemux/demux_roq.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_roq.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_roq.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -21,6 +21,8 @@
#include "demux_msg.h"
#include "osdep/mplib.h"
+using namespace mpxp;
+
#define RoQ_INFO 0x1001
#define RoQ_QUAD_CODEBOOK 0x1002
#define RoQ_QUAD_VQ 0x1011
Modified: mplayerxp/libmpdemux/demux_smjpeg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_smjpeg.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_smjpeg.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -26,6 +26,8 @@
#include "demux_msg.h"
#include "osdep/mplib.h"
+using namespace mpxp;
+
static MPXP_Rc smjpeg_probe(demuxer_t* demuxer){
int orig_pos = stream_tell(demuxer->stream);
char buf[8];
Modified: mplayerxp/libmpdemux/demux_ts.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ts.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_ts.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -41,6 +41,8 @@
#include "mpeg_hdr.h"
#include "demux_msg.h"
+using namespace mpxp;
+
#define TS_PH_PACKET_SIZE 192
#define TS_FEC_PACKET_SIZE 204
#define TS_PACKET_SIZE 188
Modified: mplayerxp/libmpdemux/demux_ty.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ty.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_ty.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -49,6 +49,7 @@
#include "osdep/mplib.h"
#include "libmpcodecs/dec_audio.h"
+using namespace mpxp;
#define AV_RB24(x) ((((uint8_t*)(x))[0] << 16) | \
(((uint8_t*)(x))[1] << 8) | \
Modified: mplayerxp/libmpdemux/demux_viv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_viv.cpp 2012-11-22 12:56:08 UTC (rev 431)
+++ mplayerxp/libmpdemux/demux_viv.cpp 2012-11-22 15:29:45 UTC (rev 432)
@@ -21,6 +21,8 @@
#include "libmpconf/cfgparser.h"
#include "osdep/mplib.h"
+using namespace mpxp;
+
/* parameters ! */
static int vivo_...
[truncated message content] |
