1. Move the macros for priority classes for OS/2 from priority.c to osdep.h

2. Define SetPriorityClass() and GetCurrentProcess() in osdep.h
3. Include osdep.h in priority.c

This removes OS2-platform check in priority.c



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30828 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 21 insertions, 23 deletions

diff --git a/osdep/osdep.h b/osdep/osdep.h
index 0a64c31120..654309c015 100644
--- a/osdep/osdep.h
+++ b/osdep/osdep.h
@@ -27,7 +27,24 @@
 #define INCL_DOS
 #define INCL_DOSDEVIOCTL
 #include <os2.h>
-#endif
+
+#include <process.h>    /* getpid() */
+
+#define REALTIME_PRIORITY_CLASS     MAKESHORT(0, PRTYC_TIMECRITICAL)
+#define HIGH_PRIORITY_CLASS         MAKESHORT(PRTYD_MAXIMUM, PRTYC_REGULAR)
+#define ABOVE_NORMAL_PRIORITY_CLASS MAKESHORT(PRTYD_MAXIMUM / 2, PRTYC_REGULAR)
+#define NORMAL_PRIORITY_CLASS       MAKESHORT(0, PRTYC_REGULAR)
+#define BELOW_NORMAL_PRIORITY_CLASS MAKESHORT(PRTYD_MAXIMUM, PRTYC_IDLETIME)
+#define IDLE_PRIORITY_CLASS         MAKESHORT(0, PRTYC_IDLETIME)
+
+#define SetPriorityClass(pid, prio) \
+            DosSetPriority(PRTYS_PROCESS, \
+                           HIBYTE(prio), \
+                           LOBYTE(prio), \
+                           pid)
+
+#define GetCurrentProcess() getpid()
+#endif /* __OS2__ */
 
 #endif /* MPLAYER_OSDEP_H */
 
diff --git a/osdep/priority.c b/osdep/priority.c
index 7d3733e9a7..2f9bafe12b 100644
--- a/osdep/priority.c
+++ b/osdep/priority.c
@@ -20,23 +20,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef __OS2__
-
-#define INCL_DOS
-#include <os2.h>
-
-#define REALTIME_PRIORITY_CLASS     MAKESHORT(0, PRTYC_TIMECRITICAL)
-#define HIGH_PRIORITY_CLASS         MAKESHORT(PRTYD_MAXIMUM, PRTYC_REGULAR)
-#define ABOVE_NORMAL_PRIORITY_CLASS MAKESHORT(PRTYD_MAXIMUM / 2, PRTYC_REGULAR)
-#define NORMAL_PRIORITY_CLASS       MAKESHORT(0, PRTYC_REGULAR)
-#define BELOW_NORMAL_PRIORITY_CLASS MAKESHORT(PRTYD_MAXIMUM, PRTYC_IDLETIME)
-#define IDLE_PRIORITY_CLASS         MAKESHORT(0, PRTYC_IDLETIME)
-
-#else
+#include "osdep.h"
 
+#ifdef _WIN32
 #include <windows.h>
-
-#endif /* __OS2__ */
+#endif
 
 #include <string.h>
 
@@ -76,13 +64,6 @@ void set_priority(void)
         mp_msg(MSGT_CPLAYER, MSGL_STATUS, MSGTR_SettingProcessPriority,
                priority_presets_defs[i].name);
 
-#ifdef __OS2__
-        DosSetPriority(PRTYS_PROCESS,
-                       HIBYTE(priority_presets_defs[i].prio),
-                       LOBYTE(priority_presets_defs[i].prio),
-                       0);
-#else
         SetPriorityClass(GetCurrentProcess(), priority_presets_defs[i].prio);
-#endif
     }
 }