diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /mplayer.c | |
parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -7,7 +7,7 @@ #include "config.h" #include "talloc.h" -#ifdef WIN32 +#if defined(__MINGW32__) || defined(__CYGWIN__) #define _UWIN 1 /*disable Non-underscored versions of non-ANSI functions as otherwise int eof would conflict with eof()*/ #include <windows.h> #endif @@ -91,7 +91,7 @@ int player_idle_mode=0; int quiet=0; int enable_mouse_movements=0; -#ifdef WIN32 +#if defined(__MINGW32__) || defined(__CYGWIN__) char * proc_priority=NULL; #endif @@ -648,7 +648,7 @@ void exit_player_with_rc(struct MPContext *mpctx, const char* how, int rc){ if (mpctx->user_muted && !mpctx->edl_muted) mixer_mute(&mpctx->mixer); uninit_player(mpctx, INITIALIZED_ALL); -#ifdef WIN32 +#if defined(__MINGW32__) || defined(__CYGWIN__) timeEndPeriod(1); #endif #ifdef CONFIG_X11 @@ -1181,7 +1181,7 @@ static void print_status(struct MPContext *mpctx, float a_pos, float a_v, float width = screen_width; else width = 80; -#if defined(WIN32) || defined(__OS2__) +#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__) /* Windows command line is broken (MinGW's rxvt works, but we * should not depend on that). */ width--; @@ -2590,9 +2590,9 @@ int gui_no_filename=0; m_config_preparse_command_line(mpctx->mconfig,argc,argv); print_version(); -#if defined(WIN32) && defined(CONFIG_WIN32DLL) +#if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_WIN32DLL) set_path_env(); -#endif /*WIN32 && CONFIG_WIN32DLL*/ +#endif #ifdef CONFIG_TV stream_tv_defaults.immediate = 1; @@ -2637,7 +2637,7 @@ int gui_no_filename=0; } mpctx->key_fifo = mp_fifo_create(opts); -#if defined(WIN32) && defined(CONFIG_GUI) +#if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_GUI) void *runningmplayer = FindWindow("MPlayer GUI for Windows", "MPlayer for Windows"); if(runningmplayer && mpctx->filename && use_gui){ COPYDATASTRUCT csData; @@ -2652,7 +2652,7 @@ int gui_no_filename=0; } #endif -#ifdef WIN32 +#if defined(__MINGW32__) || defined(__CYGWIN__) // request 1ms timer resolution timeBeginPeriod(1); if(proc_priority){ @@ -2672,7 +2672,7 @@ int gui_no_filename=0; use_gui=0; } #else -#ifndef WIN32 +#if !defined(__MINGW32__) && !defined(__CYGWIN__) if(use_gui && !vo_init()){ mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_GuiNeedsX); use_gui=0; @@ -3106,7 +3106,7 @@ if (edl_output_filename) { char *buf = strdup(mpctx->filename), *psub; char *pdot = strrchr(buf, '.'); char *pslash = strrchr(buf, '/'); -#ifdef WIN32 +#if defined(__MINGW32__) || defined(__CYGWIN__) if (!pslash) pslash = strrchr(buf, '\\'); #endif if (pdot && (!pslash || pdot > pslash)) @@ -3117,7 +3117,7 @@ if (edl_output_filename) { char *bname; int l; bname = strrchr(buf,'/'); -#ifdef WIN32 +#if defined(__MINGW32__) || defined(__CYGWIN__) if(!bname) bname = strrchr(buf,'\\'); #endif if(bname) bname++; |