Merge svn changes up to r28537

1 files changed, 8 insertions, 13 deletions

diff --git a/mplayer.c b/mplayer.c
index 54331685f7..41dff2a72f 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -90,9 +90,7 @@ int quiet=0;
 int enable_mouse_movements=0;
 float start_volume = -1;
 
-#if defined(__MINGW32__) || defined(__CYGWIN__)
-char * proc_priority=NULL;
-#endif
+#include "osdep/priority.h"
 
 char *heartbeat_cmd;
 
@@ -2628,19 +2626,16 @@ int gui_no_filename=0;
 #endif
 
 #if defined(__MINGW32__) || defined(__CYGWIN__)
+	// stop Windows from showing all kinds of annoying error dialogs
+	SetErrorMode(0x8003);
 	// request 1ms timer resolution
 	timeBeginPeriod(1);
-	if(proc_priority){
-		int i;
-        	for(i=0; priority_presets_defs[i].name; i++){
-        		if(strcasecmp(priority_presets_defs[i].name, proc_priority) == 0)
-				break;
-		}
-		mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_SettingProcessPriority,
-				priority_presets_defs[i].name);
-		SetPriorityClass(GetCurrentProcess(), priority_presets_defs[i].prio);
-	}
 #endif	
+
+#ifdef CONFIG_PRIORITY
+    set_priority();
+#endif
+
 #ifndef CONFIG_GUI
     if(use_gui){
       mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui);