Mercurial > mplayer.hg
changeset 30786:24c1cedb1de2
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
author | komh |
---|---|
date | Thu, 04 Mar 2010 12:55:30 +0000 |
parents | 2c9cfd354ca0 |
children | e10ba171be06 |
files | osdep/osdep.h osdep/priority.c |
diffstat | 2 files changed, 21 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/osdep/osdep.h Thu Mar 04 01:02:24 2010 +0000 +++ b/osdep/osdep.h Thu Mar 04 12:55:30 2010 +0000 @@ -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 */
--- a/osdep/priority.c Thu Mar 04 01:02:24 2010 +0000 +++ b/osdep/priority.c Thu Mar 04 12:55:30 2010 +0000 @@ -20,23 +20,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef __OS2__ - -#define INCL_DOS -#include <os2.h> +#include "osdep.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 - +#ifdef _WIN32 #include <windows.h> - -#endif /* __OS2__ */ +#endif #include <string.h> @@ -76,13 +64,6 @@ 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 } }