[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[636] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[636] mplayerxp
|
From: <nic...@us...> - 2013-05-08 12:54:55
|
Revision: 636
http://sourceforge.net/p/mplayerxp/code/636
Author: nickols_k
Date: 2013-05-08 12:54:26 +0000 (Wed, 08 May 2013)
Log Message:
-----------
sync with beye
Modified Paths:
--------------
mplayerxp/dump.cpp
mplayerxp/dump.h
mplayerxp/global_msg.h
mplayerxp/input2/in_msg.h
mplayerxp/input2/input.cpp
mplayerxp/input2/input.h
mplayerxp/input2/joystick.cpp
mplayerxp/input2/joystick.h
mplayerxp/input2/lirc.cpp
mplayerxp/input2/lirc.h
mplayerxp/input2/mouse.h
mplayerxp/libao3/afmt.cpp
mplayerxp/libao3/ao_alsa.cpp
mplayerxp/libao3/ao_arts.cpp
mplayerxp/libao3/ao_esd.cpp
mplayerxp/libao3/ao_jack.cpp
mplayerxp/libao3/ao_msg.h
mplayerxp/libao3/ao_nas.cpp
mplayerxp/libao3/ao_null.cpp
mplayerxp/libao3/ao_openal.cpp
mplayerxp/libao3/ao_oss.cpp
mplayerxp/libao3/ao_sdl.cpp
mplayerxp/libao3/ao_wav.cpp
mplayerxp/libao3/audio_out.cpp
mplayerxp/libao3/audio_out.h
mplayerxp/libao3/audio_out_internal.h
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_msg.h
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/codecs_ld.h
mplayerxp/libmpcodecs/dec_audio.cpp
mplayerxp/libmpcodecs/dec_video.cpp
mplayerxp/libmpcodecs/dec_video.h
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_msg.h
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/cfgparser.h
mplayerxp/libmpconf/codec-cfg.cpp
mplayerxp/libmpconf/m_option.cpp
mplayerxp/libmpconf/m_property.cpp
mplayerxp/libmpconf/m_struct.cpp
mplayerxp/libmpconf/parser_msg.h
mplayerxp/libmpdemux/aviprint.cpp
mplayerxp/libmpdemux/demux_ac3.cpp
mplayerxp/libmpdemux/demux_aiff.cpp
mplayerxp/libmpdemux/demux_asf.cpp
mplayerxp/libmpdemux/demux_avi.cpp
mplayerxp/libmpdemux/demux_bmp.cpp
mplayerxp/libmpdemux/demux_dca.cpp
mplayerxp/libmpdemux/demux_demuxers.cpp
mplayerxp/libmpdemux/demux_dv.cpp
mplayerxp/libmpdemux/demux_film.cpp
mplayerxp/libmpdemux/demux_flac.cpp
mplayerxp/libmpdemux/demux_fli.cpp
mplayerxp/libmpdemux/demux_lavf.cpp
mplayerxp/libmpdemux/demux_mkv.cpp
mplayerxp/libmpdemux/demux_mov.cpp
mplayerxp/libmpdemux/demux_mp3.cpp
mplayerxp/libmpdemux/demux_mpg.cpp
mplayerxp/libmpdemux/demux_mpxp64.cpp
mplayerxp/libmpdemux/demux_msg.h
mplayerxp/libmpdemux/demux_musepack.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_rawaudio.cpp
mplayerxp/libmpdemux/demux_rawvideo.cpp
mplayerxp/libmpdemux/demux_real.cpp
mplayerxp/libmpdemux/demux_realaud.cpp
mplayerxp/libmpdemux/demux_roq.cpp
mplayerxp/libmpdemux/demux_smjpeg.cpp
mplayerxp/libmpdemux/demux_snd_au.cpp
mplayerxp/libmpdemux/demux_ts.cpp
mplayerxp/libmpdemux/demux_ty.cpp
mplayerxp/libmpdemux/demux_viv.cpp
mplayerxp/libmpdemux/demux_voc.cpp
mplayerxp/libmpdemux/demux_vqf.cpp
mplayerxp/libmpdemux/demux_wav.cpp
mplayerxp/libmpdemux/demux_y4m.cpp
mplayerxp/libmpdemux/demuxer.cpp
mplayerxp/libmpdemux/demuxer.h
mplayerxp/libmpdemux/demuxer_info.cpp
mplayerxp/libmpdemux/demuxer_info.h
mplayerxp/libmpdemux/demuxer_packet.cpp
mplayerxp/libmpdemux/demuxer_packet.h
mplayerxp/libmpdemux/demuxer_r.cpp
mplayerxp/libmpdemux/demuxer_stream.cpp
mplayerxp/libmpdemux/demuxer_stream.h
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/stheader.cpp
mplayerxp/libmpdemux/stheader.h
mplayerxp/libmpdemux/sub_cc.cpp
mplayerxp/libmpdemux/sub_ty.cpp
mplayerxp/libmpdemux/yuv4mpeg.cpp
mplayerxp/libmpdemux/yuv4mpeg.h
mplayerxp/libmpdemux/yuv4mpeg_ratio.cpp
mplayerxp/libmpstream2/cache2.cpp
mplayerxp/libmpstream2/cdd.h
mplayerxp/libmpstream2/cdda.cpp
mplayerxp/libmpstream2/cddb.cpp
mplayerxp/libmpstream2/cookies.cpp
mplayerxp/libmpstream2/freesdp/common.cpp
mplayerxp/libmpstream2/freesdp/errorlist.cpp
mplayerxp/libmpstream2/freesdp/parser.cpp
mplayerxp/libmpstream2/http.cpp
mplayerxp/libmpstream2/http.h
mplayerxp/libmpstream2/librtsp/rtsp.cpp
mplayerxp/libmpstream2/librtsp/rtsp.h
mplayerxp/libmpstream2/librtsp/rtsp_rtp.cpp
mplayerxp/libmpstream2/librtsp/rtsp_rtp.h
mplayerxp/libmpstream2/librtsp/rtsp_session.cpp
mplayerxp/libmpstream2/librtsp/rtsp_session.h
mplayerxp/libmpstream2/mrl.cpp
mplayerxp/libmpstream2/mrl.h
mplayerxp/libmpstream2/network.cpp
mplayerxp/libmpstream2/network.h
mplayerxp/libmpstream2/network_asf.cpp
mplayerxp/libmpstream2/network_asf.h
mplayerxp/libmpstream2/network_asf_mmst.cpp
mplayerxp/libmpstream2/network_asf_mmst.h
mplayerxp/libmpstream2/network_nop.cpp
mplayerxp/libmpstream2/network_nop.h
mplayerxp/libmpstream2/network_pnm.cpp
mplayerxp/libmpstream2/network_pnm.h
mplayerxp/libmpstream2/network_real_rtsp.cpp
mplayerxp/libmpstream2/network_real_rtsp.h
mplayerxp/libmpstream2/network_rtp.cpp
mplayerxp/libmpstream2/network_rtp.h
mplayerxp/libmpstream2/network_rtsp.cpp
mplayerxp/libmpstream2/network_rtsp.h
mplayerxp/libmpstream2/pnm.cpp
mplayerxp/libmpstream2/pnm.h
mplayerxp/libmpstream2/realrtsp/asmrp.cpp
mplayerxp/libmpstream2/realrtsp/real.cpp
mplayerxp/libmpstream2/realrtsp/rmff.cpp
mplayerxp/libmpstream2/realrtsp/sdpplin.cpp
mplayerxp/libmpstream2/realrtsp/xbuffer.cpp
mplayerxp/libmpstream2/rtp_cache.cpp
mplayerxp/libmpstream2/rtp_cache.h
mplayerxp/libmpstream2/s_cdd.cpp
mplayerxp/libmpstream2/s_dvdnav.cpp
mplayerxp/libmpstream2/s_dvdread.cpp
mplayerxp/libmpstream2/s_file.cpp
mplayerxp/libmpstream2/s_ftp.cpp
mplayerxp/libmpstream2/s_lavc.cpp
mplayerxp/libmpstream2/s_network.cpp
mplayerxp/libmpstream2/s_null.cpp
mplayerxp/libmpstream2/s_oss.cpp
mplayerxp/libmpstream2/s_rtsp.cpp
mplayerxp/libmpstream2/s_tv.cpp
mplayerxp/libmpstream2/s_udp.cpp
mplayerxp/libmpstream2/s_vcdnav.cpp
mplayerxp/libmpstream2/stream.cpp
mplayerxp/libmpstream2/stream.h
mplayerxp/libmpstream2/stream_internal.h
mplayerxp/libmpstream2/stream_msg.h
mplayerxp/libmpstream2/tcp.cpp
mplayerxp/libmpstream2/tcp.h
mplayerxp/libmpstream2/tvi/frequencies.cpp
mplayerxp/libmpstream2/tvi/frequencies.h
mplayerxp/libmpstream2/tvi/tv.h
mplayerxp/libmpstream2/tvi/tvi_bsdbt848.cpp
mplayerxp/libmpstream2/tvi/tvi_def.h
mplayerxp/libmpstream2/tvi/tvi_dummy.cpp
mplayerxp/libmpstream2/tvi/tvi_v4l.cpp
mplayerxp/libmpstream2/udp.cpp
mplayerxp/libmpstream2/udp.h
mplayerxp/libmpstream2/url.cpp
mplayerxp/libmpstream2/url.h
mplayerxp/libmpsub/find_sub.cpp
mplayerxp/libmpsub/mpsub_msg.h
mplayerxp/libmpsub/spudec.cpp
mplayerxp/libmpsub/spudec.h
mplayerxp/libmpsub/subreader.cpp
mplayerxp/libmpsub/subreader.h
mplayerxp/libmpsub/vobsub.cpp
mplayerxp/libplaytree2/asxparser.cpp
mplayerxp/libplaytree2/asxparser.h
mplayerxp/libplaytree2/playtree.cpp
mplayerxp/libplaytree2/playtree.h
mplayerxp/libplaytree2/playtree_msg.h
mplayerxp/libplaytree2/playtreeparser.cpp
mplayerxp/libplaytree2/playtreeparser.h
mplayerxp/libvo2/aspect.cpp
mplayerxp/libvo2/aspect.h
mplayerxp/libvo2/font_load.cpp
mplayerxp/libvo2/img_format.cpp
mplayerxp/libvo2/jpeg_enc.cpp
mplayerxp/libvo2/osd_render.cpp
mplayerxp/libvo2/osd_render.h
mplayerxp/libvo2/screenshot.cpp
mplayerxp/libvo2/sub.cpp
mplayerxp/libvo2/sub.h
mplayerxp/libvo2/video_out.cpp
mplayerxp/libvo2/video_out.h
mplayerxp/libvo2/video_out_internal.h
mplayerxp/libvo2/vidix_system.cpp
mplayerxp/libvo2/vidix_system.h
mplayerxp/libvo2/vo_fbdev.cpp
mplayerxp/libvo2/vo_msg.h
mplayerxp/libvo2/vo_null.cpp
mplayerxp/libvo2/vo_opengl.cpp
mplayerxp/libvo2/vo_sdl.cpp
mplayerxp/libvo2/vo_vesa.cpp
mplayerxp/libvo2/vo_x11.cpp
mplayerxp/libvo2/vo_xv.cpp
mplayerxp/libvo2/x11_system.cpp
mplayerxp/libvo2/x11_system.h
mplayerxp/main.cpp
mplayerxp/mplayerxp.h
mplayerxp/mpxp_msg.cpp
mplayerxp/mpxp_msg.h
mplayerxp/nls/nls.h
mplayerxp/nls/nls_msg.h
mplayerxp/nls/recode.cpp
mplayerxp/osdep/aclib.cpp
mplayerxp/osdep/aclib_template.h
mplayerxp/osdep/bswap.h
mplayerxp/osdep/cpudetect.cpp
mplayerxp/osdep/cpudetect.h
mplayerxp/osdep/fastmemcpy.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/mp_malloc.h
mplayerxp/osdep/mplib.cpp
mplayerxp/osdep/mplib.h
mplayerxp/osdep/osdep_msg.h
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/player_msg.h
mplayerxp/postproc/af.cpp
mplayerxp/postproc/af_ao3.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.h
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/pp_msg.h
mplayerxp/postproc/swscale.cpp
mplayerxp/postproc/vf.cpp
mplayerxp/postproc/vf.h
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_vo2.cpp
mplayerxp/postproc/vf_yuvcsp.cpp
mplayerxp/postproc/vf_yuy2.cpp
mplayerxp/postproc/vf_yvu9.cpp
mplayerxp/xmpcore/PointerProtector.h
mplayerxp/xmpcore/sig_hand.cpp
mplayerxp/xmpcore/sig_hand.h
mplayerxp/xmpcore/xmp_adecoder.cpp
mplayerxp/xmpcore/xmp_adecoder.h
mplayerxp/xmpcore/xmp_aframe.cpp
mplayerxp/xmpcore/xmp_aframe.h
mplayerxp/xmpcore/xmp_aplayer.cpp
mplayerxp/xmpcore/xmp_aplayer.h
mplayerxp/xmpcore/xmp_context.cpp
mplayerxp/xmpcore/xmp_context.h
mplayerxp/xmpcore/xmp_core.cpp
mplayerxp/xmpcore/xmp_core.h
mplayerxp/xmpcore/xmp_enums.h
mplayerxp/xmpcore/xmp_image.cpp
mplayerxp/xmpcore/xmp_image.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 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/dump.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
dump.c - stream dumper
*/
@@ -20,7 +20,7 @@
#include "global_msg.h"
#include "dump.h"
-namespace mpxp {
+namespace usr {
static char *media=NULL,*port=NULL;
@@ -464,4 +464,4 @@
,priv->asize);
}
-} // namespace mpxp
+} // namespace usr
Modified: mplayerxp/dump.h
===================================================================
--- mplayerxp/dump.h 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/dump.h 2013-05-08 12:54:26 UTC (rev 636)
@@ -4,7 +4,7 @@
#ifndef DUMP_H_INCLUDED
#define DUMP_H_INCLUDED 1
#include "libmpdemux/demuxer_r.h"
-namespace mpxp {
+namespace usr {
int dump_parse(const char *param);
void dump_stream(Stream *stream);
void dump_mux_init(Demuxer *demuxer,libinput_t&libinput);
Modified: mplayerxp/global_msg.h
===================================================================
--- mplayerxp/global_msg.h 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/global_msg.h 2013-05-08 12:54:26 UTC (rev 636)
@@ -4,7 +4,7 @@
#define MSGT_CLASS MSGT_GLOBAL
#include "mpxp_msg.h"
-namespace mpxp {
+namespace usr {
static mpxp_ostream_info mpxp_info(MSGT_GLOBAL);
static mpxp_ostream_fatal mpxp_fatal(MSGT_GLOBAL);
static mpxp_ostream_err mpxp_err(MSGT_GLOBAL);
@@ -17,5 +17,5 @@
static mpxp_ostream_dbg3 mpxp_dbg3(MSGT_GLOBAL);
static mpxp_ostream_dbg4 mpxp_dbg4(MSGT_GLOBAL);
-} // namespace mpxp
+} // namespace usr
#endif
Modified: mplayerxp/input2/in_msg.h
===================================================================
--- mplayerxp/input2/in_msg.h 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/input2/in_msg.h 2013-05-08 12:54:26 UTC (rev 636)
@@ -3,7 +3,7 @@
#include "mpxp_msg.h"
-namespace mpxp {
+namespace usr {
static mpxp_ostream_info mpxp_info(MSGT_INPUT);
static mpxp_ostream_fatal mpxp_fatal(MSGT_INPUT);
static mpxp_ostream_err mpxp_err(MSGT_INPUT);
@@ -15,6 +15,6 @@
static mpxp_ostream_dbg2 mpxp_dbg2(MSGT_INPUT);
static mpxp_ostream_dbg3 mpxp_dbg3(MSGT_INPUT);
static mpxp_ostream_dbg4 mpxp_dbg4(MSGT_INPUT);
-} // namespace mpxp
+} // namespace usr
#endif
Modified: mplayerxp/input2/input.cpp
===================================================================
--- mplayerxp/input2/input.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/input2/input.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <iomanip>
#include <stdlib.h>
@@ -37,7 +37,7 @@
#include "joystick.h"
#include "osdep/getch2.h"
-namespace mpxp {
+namespace usr {
static const int MP_MAX_KEY_FD=10;
static const int MP_MAX_CMD_FD=10;
@@ -1428,4 +1428,4 @@
return MPXP_False;
}
-} // namespace mpxp
+} // namespace usr
Modified: mplayerxp/input2/input.h
===================================================================
--- mplayerxp/input2/input.h 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/input2/input.h 2013-05-08 12:54:26 UTC (rev 636)
@@ -2,13 +2,13 @@
#define INPUT_H_INCLUDED 1
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <map>
#include "xmpcore/xmp_enums.h"
-namespace mpxp {
+namespace usr {
// All commands id
enum {
MP_CMD_SEEK =0,
@@ -166,5 +166,5 @@
extern void mp_input_print_binds(libinput_t& handle);
// Interruptible usleep: (used by libmpdemux)
extern MPXP_Rc mp_input_check_interrupt(libinput_t& handle,int time);
-} // namespace mpxp
+} // namespace usr
#endif
Modified: mplayerxp/input2/joystick.cpp
===================================================================
--- mplayerxp/input2/joystick.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/input2/joystick.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#ifdef HAVE_JOYSTICK
#include "joystick.h"
@@ -27,7 +27,7 @@
#include "in_msg.h"
-namespace mpxp {
+namespace usr {
typedef struct priv_s {
int axis[10];
int btns;
@@ -146,11 +146,11 @@
}
return MP_INPUT_NOTHING;
}
-} // namespace mpxp
+} // namespace usr
#else
-namespace mpxp {
+namespace usr {
any_t* mp_input_joystick_open(const char* dev) { UNUNSED(dev); return NULL; }
void mp_input_joystick_close(any_t* ctx) { UNUSED(ctx); }
int mp_input_joystick_read(any_t* ctx) { UNUSED(ctx); return MP_INPUT_NOTHING; }
-} // namespace mpxp
+} // namespace usr
#endif
Modified: mplayerxp/input2/joystick.h
===================================================================
--- mplayerxp/input2/joystick.h 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/input2/joystick.h 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,7 +1,7 @@
#ifndef JOYSTICK_H_INCLUDED
#define JOYSTICK_H_INCLUDED 1
-namespace mpxp {
+namespace usr {
enum {
JOY_BASE =(0x100+128),
JOY_AXIS0_PLUS =(JOY_BASE+0),
@@ -42,5 +42,5 @@
extern any_t* mp_input_joystick_open(const char* dev);
extern void mp_input_joystick_close(any_t* ctx);
extern int mp_input_joystick_read(any_t* ctx);
-} // namespace mpxp
+} // namespace usr
#endif
Modified: mplayerxp/input2/lirc.cpp
===================================================================
--- mplayerxp/input2/lirc.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/input2/lirc.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#ifdef HAVE_LIRC
@@ -17,7 +17,7 @@
#include "input.h"
#include "in_msg.h"
-namespace mpxp {
+namespace usr {
static struct lirc_config *lirc_config;
char *lirc_configfile;
@@ -114,5 +114,5 @@
lirc_deinit();
delete priv;
}
-}// namespace mpxp
+}// namespace usr
#endif
Modified: mplayerxp/input2/lirc.h
===================================================================
--- mplayerxp/input2/lirc.h 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/input2/lirc.h 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,8 +1,8 @@
#ifndef __LIRC_H_INCLUDED
#define __LIRC_H_INCLUDED 1
-namespace mpxp {
+namespace usr {
extern any_t* mp_input_lirc_open(void);
extern int mp_input_lirc_read_cmd(any_t* ctx,char* dest, int s);
extern void mp_input_lirc_close(any_t* ctx);
-} // namespace mpxp
+} // namespace usr
#endif
Modified: mplayerxp/input2/mouse.h
===================================================================
--- mplayerxp/input2/mouse.h 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/input2/mouse.h 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#ifndef MOUSE_H_INCLUDED
#define MOUSE_H_INCLUDED 1
-namespace mpxp {
+namespace usr {
enum {
MOUSE_BASE=((0x100+256)|MP_NO_REPEAT_KEY),
MOUSE_BTN0=(MOUSE_BASE+0),
@@ -27,5 +27,5 @@
MOUSE_BTN8_DBL=(MOUSE_BASE_DBL+8),
MOUSE_BTN9_DBL=(MOUSE_BASE_DBL+9)
};
-} // namespace mpxp
+} // namespace usr
#endif
\ No newline at end of file
Modified: mplayerxp/libao3/afmt.cpp
===================================================================
--- mplayerxp/libao3/afmt.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libao3/afmt.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include "afmt.h"
const char* afmt2str(unsigned fmt) {
Modified: mplayerxp/libao3/ao_alsa.cpp
===================================================================
--- mplayerxp/libao3/ao_alsa.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libao3/ao_alsa.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
ao_alsa9 - ALSA-0.9.x output plugin for MPlayer
@@ -31,7 +31,7 @@
#include "ao_msg.h"
#include "libmpstream2/mrl.h"
-namespace mpxp {
+namespace usr {
typedef struct priv_conf_s {
int mmap;
int noblock;
@@ -1004,5 +1004,5 @@
"under developement",
query_interface
};
-} //namespace mpxp
+} //namespace usr
Modified: mplayerxp/libao3/ao_arts.cpp
===================================================================
--- mplayerxp/libao3/ao_arts.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libao3/ao_arts.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* aRts (KDE analogue Real-Time synthesizer) audio output driver for MPlayerXP
*
@@ -32,7 +32,7 @@
#include "afmt.h"
#include "ao_msg.h"
-namespace mpxp {
+namespace usr {
/* Feel mp_free to experiment with the following values: */
static const int ARTS_PACKETS=10; /* Number of audio packets */
static const int ARTS_PACKET_SIZE_LOG2=11; /* Log2 of audio packet size */
@@ -205,4 +205,4 @@
"",
query_interface
};
-} // namespace mpxp
+} // namespace usr
Modified: mplayerxp/libao3/ao_esd.cpp
===================================================================
--- mplayerxp/libao3/ao_esd.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libao3/ao_esd.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* EsounD (Enlightened Sound Daemon) audio output driver for MPlayerXP
*
@@ -57,7 +57,7 @@
#include "ao_msg.h"
-namespace mpxp {
+namespace usr {
static const int ESD_RESAMPLES=0;
#define ESD_DEBUG 0
@@ -481,4 +481,4 @@
"",
query_interface
};
-} // namespace mpxp
+} // namespace usr
Modified: mplayerxp/libao3/ao_jack.cpp
===================================================================
--- mplayerxp/libao3/ao_jack.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libao3/ao_jack.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* JACK audio output driver for MPlayer
*
@@ -39,7 +39,7 @@
#include "mpxp_conf_lavc.h"
#include <jack/jack.h>
-namespace mpxp {
+namespace usr {
//! maximum number of channels supported, avoids lots of mallocs
static const int MAX_CHANS=6;
@@ -365,4 +365,4 @@
"based on ao_sdl.c",
query_interface
};
-} // namespace mpxp
+} // namespace usr
Modified: mplayerxp/libao3/ao_msg.h
===================================================================
--- mplayerxp/libao3/ao_msg.h 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libao3/ao_msg.h 2013-05-08 12:54:26 UTC (rev 636)
@@ -3,7 +3,7 @@
#include "mpxp_msg.h"
-namespace mpxp {
+namespace usr {
static mpxp_ostream_info mpxp_info(MSGT_AO);
static mpxp_ostream_fatal mpxp_fatal(MSGT_AO);
static mpxp_ostream_err mpxp_err(MSGT_AO);
@@ -15,6 +15,6 @@
static mpxp_ostream_dbg2 mpxp_dbg2(MSGT_AO);
static mpxp_ostream_dbg3 mpxp_dbg3(MSGT_AO);
static mpxp_ostream_dbg4 mpxp_dbg4(MSGT_AO);
-} // namespace mpxp
+} // namespace usr
#endif
Modified: mplayerxp/libao3/ao_nas.cpp
===================================================================
--- mplayerxp/libao3/ao_nas.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libao3/ao_nas.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* NAS audio output driver
*
@@ -62,7 +62,7 @@
#include "afmt.h"
#include "ao_msg.h"
-namespace mpxp {
+namespace usr {
/* NAS_FRAG_SIZE must be a power-of-two value */
static const int NAS_FRAG_SIZE=4096;
@@ -634,4 +634,4 @@
"",
query_interface
};
-} // namespace mpxp
\ No newline at end of file
+} // namespace usr
\ No newline at end of file
Modified: mplayerxp/libao3/ao_null.cpp
===================================================================
--- mplayerxp/libao3/ao_null.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libao3/ao_null.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
@@ -18,7 +18,7 @@
#include "audio_out_internal.h"
#include "ao_msg.h"
-namespace mpxp {
+namespace usr {
static const uint32_t WAV_ID_RIFF=FOURCC_TAG(0x46,0x46,0x49,0x52); /* "RIFF" */
static const uint32_t WAV_ID_WAVE=FOURCC_TAG(0x45,0x56,0x41,0x57); /* "WAVE" */
static const uint32_t WAV_ID_FMT =FOURCC_TAG(0x20,0x74,0x6d,0x66); /* "fmt " */
@@ -255,4 +255,4 @@
"",
query_interface
};
-} // namespace mpxp
+} // namespace usr
Modified: mplayerxp/libao3/ao_openal.cpp
===================================================================
--- mplayerxp/libao3/ao_openal.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libao3/ao_openal.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* OpenAL audio output driver for MPlayerXP
*
@@ -36,7 +36,7 @@
#include "osdep/timer.h"
#include "ao_msg.h"
-namespace mpxp {
+namespace usr {
static const int MAX_CHANS=8;
static const int NUM_BUF=128;
static const int CHUNK_SIZE=512;
@@ -273,4 +273,4 @@
"",
query_interface
};
-} // namespace mpxp
+} // namespace usr
Modified: mplayerxp/libao3/ao_oss.cpp
===================================================================
--- mplayerxp/libao3/ao_oss.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libao3/ao_oss.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
@@ -18,7 +18,7 @@
#include "audio_out_internal.h"
#include "ao_msg.h"
-namespace mpxp {
+namespace usr {
const char *oss_mixer_device = PATH_DEV_MIXER;
/* Support for >2 output channels added 2001-11-25 - Steve Davies <st...@da...> */
class Oss_AO_Interface : public AO_Interface {
@@ -445,4 +445,4 @@
"",
query_interface
};
-} // namespace mpxp
+} // namespace usr
Modified: mplayerxp/libao3/ao_sdl.cpp
===================================================================
--- mplayerxp/libao3/ao_sdl.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libao3/ao_sdl.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* ao_sdl.c - libao3 SDLlib Audio Output Driver for MPlayer
*
@@ -26,7 +26,7 @@
#include "osdep/fastmemcpy.h"
#include "ao_msg.h"
-namespace mpxp {
+namespace usr {
// Samplesize used by the SDLlib AudioSpec struct
static const int SAMPLESIZE=1024;
@@ -349,4 +349,4 @@
"",
query_interface
};
-} // namespace mpxp
+} // namespace usr
Modified: mplayerxp/libao3/ao_wav.cpp
===================================================================
--- mplayerxp/libao3/ao_wav.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libao3/ao_wav.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* PCM audio output driver
*
@@ -39,7 +39,7 @@
#include <windows.h>
#endif
-namespace mpxp {
+namespace usr {
static const uint32_t WAV_ID_RIFF=0x46464952; /* "RIFF" */
static const uint32_t WAV_ID_WAVE=0x45564157; /* "WAVE" */
static const uint32_t WAV_ID_FMT =0x20746d66; /* "fmt " */
Modified: mplayerxp/libao3/audio_out.cpp
===================================================================
--- mplayerxp/libao3/audio_out.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libao3/audio_out.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -10,7 +10,7 @@
#include "afmt.h"
#include "ao_msg.h"
-namespace mpxp {
+namespace usr {
extern const ao_info_t audio_out_wav;
extern const ao_info_t audio_out_null;
#ifdef USE_OSS_AUDIO
@@ -364,4 +364,4 @@
priv.muted=1;
}
}
-} // namespace mpxp
+} // namespace usr
Modified: mplayerxp/libao3/audio_out.h
===================================================================
--- mplayerxp/libao3/audio_out.h 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libao3/audio_out.h 2013-05-08 12:54:26 UTC (rev 636)
@@ -5,7 +5,7 @@
#include <string>
-namespace mpxp {
+namespace usr {
class AO_Interface;
/** Text description of AO-driver */
@@ -73,5 +73,5 @@
/* prototypes */
extern const char * __FASTCALL__ ao_format_name(int format);
extern int __FASTCALL__ ao_format_bits(int format);
-} // namespace mpxp
+} // namespace usr
#endif
Modified: mplayerxp/libao3/audio_out_internal.h
===================================================================
--- mplayerxp/libao3/audio_out_internal.h 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libao3/audio_out_internal.h 2013-05-08 12:54:26 UTC (rev 636)
@@ -4,7 +4,7 @@
#include <string>
-namespace mpxp {
+namespace usr {
/** AO-driver interface */
class AO_Interface : public Opaque {
public:
@@ -65,5 +65,5 @@
protected:
std::string subdevice;
};
-} // namespace mpxp
+} // namespace usr
#endif
Modified: mplayerxp/libmpcodecs/ad.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
ad.c - audio decoder interface
*/
Modified: mplayerxp/libmpcodecs/ad_a52.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_a52.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#define __USE_XOPEN 1
Modified: mplayerxp/libmpcodecs/ad_acm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_acm.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: mplayerxp/libmpcodecs/ad_dca.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_dca.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#define __USE_XOPEN 1
Modified: mplayerxp/libmpcodecs/ad_dmo.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_dmo.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: mplayerxp/libmpcodecs/ad_dshow.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dshow.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_dshow.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: mplayerxp/libmpcodecs/ad_dvdpcm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dvdpcm.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_dvdpcm.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: mplayerxp/libmpcodecs/ad_faad.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_faad.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/* 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>
Modified: mplayerxp/libmpcodecs/ad_hwac3.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_hwac3.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#define __USE_XOPEN 1
Modified: mplayerxp/libmpcodecs/ad_lavc.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_lavc.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_lavc.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#define __USE_GNU 1
Modified: mplayerxp/libmpcodecs/ad_libdv.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_libdv.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Modified: mplayerxp/libmpcodecs/ad_mp3.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_mp3.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: mplayerxp/libmpcodecs/ad_msg.h
===================================================================
--- mplayerxp/libmpcodecs/ad_msg.h 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_msg.h 2013-05-08 12:54:26 UTC (rev 636)
@@ -4,7 +4,7 @@
#define MSGT_CLASS MSGT_DECAUDIO
#include "mpxp_msg.h"
-namespace mpxp {
+namespace usr {
static mpxp_ostream_info mpxp_info(MSGT_DECAUDIO);
static mpxp_ostream_fatal mpxp_fatal(MSGT_DECAUDIO);
static mpxp_ostream_err mpxp_err(MSGT_DECAUDIO);
@@ -16,6 +16,6 @@
static mpxp_ostream_dbg2 mpxp_dbg2(MSGT_DECAUDIO);
static mpxp_ostream_dbg3 mpxp_dbg3(MSGT_DECAUDIO);
static mpxp_ostream_dbg4 mpxp_dbg4(MSGT_DECAUDIO);
-} // namespace mpxp
+} // namespace usr
#endif
Modified: mplayerxp/libmpcodecs/ad_null.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_null.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_null.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: mplayerxp/libmpcodecs/ad_pcm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_pcm.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_pcm.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: mplayerxp/libmpcodecs/ad_qtaudio.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_qtaudio.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: mplayerxp/libmpcodecs/ad_real.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_real.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_real.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
Modified: mplayerxp/libmpcodecs/ad_twin.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_twin.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: mplayerxp/libmpcodecs/ad_vorbis.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/ad_vorbis.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Modified: mplayerxp/libmpcodecs/codecs_ld.cpp
===================================================================
--- mplayerxp/libmpcodecs/codecs_ld.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/codecs_ld.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
codecs_ld - light interface to codec loader
*/
@@ -13,7 +13,7 @@
#include "mpxp_help.h"
#include "global_msg.h"
-namespace mpxp {
+namespace usr {
any_t* ld_codec(const std::string& name,const std::string& url_hint)
{
any_t*dll_handle;
@@ -63,4 +63,4 @@
if(!rval) mpxp_err<<"[codec_ld] "<<MSGTR_CODEC_DLL_SYM_ERR<<":"<<sym_name<<std::endl;
return rval;
}
-} // namespace mpxp
+} // namespace usr
Modified: mplayerxp/libmpcodecs/codecs_ld.h
===================================================================
--- mplayerxp/libmpcodecs/codecs_ld.h 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/codecs_ld.h 2013-05-08 12:54:26 UTC (rev 636)
@@ -6,10 +6,10 @@
#include "mpxp_config.h"
#include <string>
-namespace mpxp {
+namespace usr {
extern any_t* ld_codec(const std::string& name,const std::string& url_hint);
/* extern char * codec_name( const char *name );*/
extern any_t* ld_sym(any_t*handle,const std::string& sym_name);
extern any_t* ld_aliased_sym(any_t*handle,const std::string& sym_name,...);
-} // namespace mpxp
+} // namespace usr
#endif
Modified: mplayerxp/libmpcodecs/dec_audio.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/dec_audio.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <algorithm>
#include <stdio.h>
Modified: mplayerxp/libmpcodecs/dec_video.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_video.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/dec_video.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#ifdef _OPENMP
#include <omp.h>
Modified: mplayerxp/libmpcodecs/dec_video.h
===================================================================
--- mplayerxp/libmpcodecs/dec_video.h 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/dec_video.h 2013-05-08 12:54:26 UTC (rev 636)
@@ -3,7 +3,7 @@
#include "xmpcore/xmp_enums.h"
#include "libmpdemux/demuxer_r.h"
-namespace mpxp {
+namespace usr {
struct libinput_t;
}
Modified: mplayerxp/libmpcodecs/liba52/bit_allocate.cpp
===================================================================
--- mplayerxp/libmpcodecs/liba52/bit_allocate.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/liba52/bit_allocate.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* bit_allocate.c
* Copyright (C) 2000-2002 Michel Lespinasse <wa...@zo...>
Modified: mplayerxp/libmpcodecs/liba52/bitstream.cpp
===================================================================
--- mplayerxp/libmpcodecs/liba52/bitstream.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/liba52/bitstream.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* bitstream.c
* Copyright (C) 2000-2002 Michel Lespinasse <wa...@zo...>
Modified: mplayerxp/libmpcodecs/liba52/crc.cpp
===================================================================
--- mplayerxp/libmpcodecs/liba52/crc.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/liba52/crc.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* crc.c
*
Modified: mplayerxp/libmpcodecs/liba52/downmix.cpp
===================================================================
--- mplayerxp/libmpcodecs/liba52/downmix.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/liba52/downmix.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* downmix.c
* Copyright (C) 2000-2002 Michel Lespinasse <wa...@zo...>
Modified: mplayerxp/libmpcodecs/liba52/imdct.cpp
===================================================================
--- mplayerxp/libmpcodecs/liba52/imdct.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/liba52/imdct.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* imdct.c
* Copyright (C) 2000-2002 Michel Lespinasse <wa...@zo...>
Modified: mplayerxp/libmpcodecs/liba52/parse.cpp
===================================================================
--- mplayerxp/libmpcodecs/liba52/parse.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/liba52/parse.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* parse.c
* Copyright (C) 2000-2002 Michel Lespinasse <wa...@zo...>
Modified: mplayerxp/libmpcodecs/liba52/resample.cpp
===================================================================
--- mplayerxp/libmpcodecs/liba52/resample.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/liba52/resample.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
// a52_resample_init should find the requested converter (from type flags ->
// given number of channels) and set up some function pointers...
Modified: mplayerxp/libmpcodecs/libdca/bitstream.cpp
===================================================================
--- mplayerxp/libmpcodecs/libdca/bitstream.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/libdca/bitstream.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* bitstream.c
* Copyright (C) 2004 Gildas Bazin <gb...@vi...>
Modified: mplayerxp/libmpcodecs/libdca/downmix.cpp
===================================================================
--- mplayerxp/libmpcodecs/libdca/downmix.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/libdca/downmix.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* downmix.c
* Copyright (C) 2004 Gildas Bazin <gb...@vi...>
Modified: mplayerxp/libmpcodecs/libdca/parse.cpp
===================================================================
--- mplayerxp/libmpcodecs/libdca/parse.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/libdca/parse.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* parse.c
* Copyright (C) 2004 Gildas Bazin <gb...@vi...>
Modified: mplayerxp/libmpcodecs/libdca/resample.cpp
===================================================================
--- mplayerxp/libmpcodecs/libdca/resample.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/libdca/resample.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
// dca_resample_init should find the requested converter (from type flags ->
// given number of channels) and set up some function pointers...
Modified: mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.cpp
===================================================================
--- mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
RTjpeg (C) Justin Schoeman 1998 (ju...@su...)
Modified: mplayerxp/libmpcodecs/libnuppelvideo/minilzo.cpp
===================================================================
--- mplayerxp/libmpcodecs/libnuppelvideo/minilzo.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/libnuppelvideo/minilzo.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/* minilzo.c -- mini subset of the LZO real-time data compression library
This file is part of the LZO real-time data compression library.
Modified: mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.cpp
===================================================================
--- mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* NuppelVideo 0.05 file parser
* for MPlayer
Modified: mplayerxp/libmpcodecs/vd.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Modified: mplayerxp/libmpcodecs/vd_divx4.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_divx4.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_divx4.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
HACKING notes:
first time it was OpenDivx project by Mayo (unsupported by mplayerxp)
Modified: mplayerxp/libmpcodecs/vd_dmo.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_dmo.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_dmo.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
Modified: mplayerxp/libmpcodecs/vd_dshow.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_dshow.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_dshow.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
Modified: mplayerxp/libmpcodecs/vd_huffyuv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_huffyuv.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_huffyuv.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
*
* HuffYUV Decoder for Mplayer
Modified: mplayerxp/libmpcodecs/vd_lavc.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_lavc.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_lavc.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <algorithm>
#include <ctype.h>
Modified: mplayerxp/libmpcodecs/vd_libdv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_libdv.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_libdv.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Modified: mplayerxp/libmpcodecs/vd_libmpeg2.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_libmpeg2.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_libmpeg2.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
we still need that:
benchmarks:
Modified: mplayerxp/libmpcodecs/vd_mpegpes.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_mpegpes.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_mpegpes.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
Modified: mplayerxp/libmpcodecs/vd_msg.h
===================================================================
--- mplayerxp/libmpcodecs/vd_msg.h 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_msg.h 2013-05-08 12:54:26 UTC (rev 636)
@@ -4,7 +4,7 @@
#define MSGT_CLASS MSGT_DECVIDEO
#include "mpxp_msg.h"
-namespace mpxp {
+namespace usr {
static mpxp_ostream_info mpxp_info(MSGT_DECVIDEO);
static mpxp_ostream_fatal mpxp_fatal(MSGT_DECVIDEO);
static mpxp_ostream_err mpxp_err(MSGT_DECVIDEO);
@@ -16,6 +16,6 @@
static mpxp_ostream_dbg2 mpxp_dbg2(MSGT_DECVIDEO);
static mpxp_ostream_dbg3 mpxp_dbg3(MSGT_DECVIDEO);
static mpxp_ostream_dbg4 mpxp_dbg4(MSGT_DECVIDEO);
-} // namespace mpxp
+} // namespace usr
#endif
Modified: mplayerxp/libmpcodecs/vd_null.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_null.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_null.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
Modified: mplayerxp/libmpcodecs/vd_nuv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_nuv.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_nuv.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include "libnuppelvideo/nuppelvideo.h"
Modified: mplayerxp/libmpcodecs/vd_qtvideo.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_qtvideo.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_qtvideo.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#define __STDC_FORMAT_MACROS
#include <stdio.h>
#include <stdlib.h>
Modified: mplayerxp/libmpcodecs/vd_raw.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_raw.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_raw.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
Modified: mplayerxp/libmpcodecs/vd_real.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_real.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_real.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <inttypes.h>
Modified: mplayerxp/libmpcodecs/vd_theora.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_theora.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_theora.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
Modified: mplayerxp/libmpcodecs/vd_vfw.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_vfw.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_vfw.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
#include "mplayerxp.h"
#include <stdio.h>
Modified: mplayerxp/libmpcodecs/vd_xanim.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_xanim.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_xanim.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
xacodec.c -- XAnim Video Codec DLL support
Modified: mplayerxp/libmpcodecs/vd_xvid.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_xvid.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpcodecs/vd_xvid.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
Xvid codec - is successor of odivx
*/
Modified: mplayerxp/libmpconf/cfgparser.cpp
===================================================================
--- mplayerxp/libmpconf/cfgparser.cpp 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpconf/cfgparser.cpp 2013-05-08 12:54:26 UTC (rev 636)
@@ -1,6 +1,6 @@
#include "mpxp_config.h"
#include "osdep/mplib.h"
-using namespace mpxp;
+using namespace usr;
/*
* command line and config file parser
* by Szabolcs Berecz <sz...@in...>
@@ -28,7 +28,7 @@
#include "parser_msg.h"
#include "osdep/get_path.h"
-namespace mpxp {
+namespace usr {
static const int MAX_RECURSION_DEPTH=8;
typedef int (*cfg_func_arg_param_t)(const mpxp_option_t *,const std::string& ,const std::string& );
@@ -885,4 +885,4 @@
}
}
-} // namespace mpxp
+} // namespace usr
Modified: mplayerxp/libmpconf/cfgparser.h
===================================================================
--- mplayerxp/libmpconf/cfgparser.h 2013-05-08 05:23:43 UTC (rev 635)
+++ mplayerxp/libmpconf/cfgparser.h 2013-05-08 12:54:26 UTC (rev 636)
@@ -8,7 +8,7 @@
#include <string>
#include <map>
-namespace mpxp {
+namespace usr {
struct libinput_t;
struct PlayTree;
@@ -145,6 +145,6 @@
inline M_Config::flags_e operator|=(M_Config::flags_e& a, M_Config::flags_e b) { return (a=static_cast<M_Config::flags_e>(static_cast<unsigned>(a)|static_cast<unsigned>(b))); }
inline M_Config::flags_e operator&=(M_Config::flags_e& a, M_Co...
[truncated message content] |
