Index: osdep/osdep.h
===================================================================
--- osdep/osdep.h	(revision 0)
+++ osdep/osdep.h	(revision 0)
@@ -0,0 +1,33 @@
+/*
+ * Header in order to include OS-specific headers, macros, types and so on
+ *
+ * Copyright (c) 2010 by KO Myung-Hun (komh@chollian.net)
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_OSDEP_H
+#define MPLAYER_OSDEP_H
+
+#ifdef __OS2__
+#define INCL_DOS
+#define INCL_DOSDEVIOCTL
+#include <os2.h>
+#endif
+
+#endif /* MPLAYER_OSDEP_H */
+
Index: stream/stream_cddb.c
===================================================================
--- stream/stream_cddb.c	(revision 30696)
+++ stream/stream_cddb.c	(working copy)
@@ -68,12 +68,18 @@
 #include "mpbswap.h"
 #endif
 
+#include "osdep/osdep.h"
+
 #include "cdd.h"
 #include "version.h"
 #include "stream.h"
 #include "network.h"
 #include "libavutil/common.h"
 
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
 #define DEFAULT_FREEDB_SERVER "freedb.freedb.org"
 #define DEFAULT_CACHE_DIR     "/.cddb/"
 
@@ -110,6 +116,78 @@
     }
     CloseHandle(drive);
 
+#elif defined(__OS2__)
+    UCHAR auchParamDisk[4] = {'C', 'D', '0', '1'};
+
+    struct {
+        BYTE    bFirstTrack;
+        BYTE    bLastTrack;
+        BYTE    bLeadOutF;
+        BYTE    bLeadOutS;
+        BYTE    bLeadOutM;
+        BYTE    bLeadOutReserved;
+    } __attribute__((packed)) sDataDisk;
+
+    struct {
+        UCHAR   auchSign[4];
+        BYTE    bTrack;
+    } __attribute__((packed)) sParamTrack = {{'C', 'D', '0', '1'},};
+
+    struct {
+        BYTE    bStartF;
+        BYTE    bStartS;
+        BYTE    bStartM;
+        BYTE    bStartReserved;
+        BYTE    bControlInfo;
+    } __attribute__((packed)) sDataTrack;
+
+    HFILE hcd;
+    ULONG ulAction;
+    ULONG ulParamLen;
+    ULONG ulDataLen;
+    ULONG rc;
+
+    rc = DosOpen(dev, &hcd, &ulAction, 0, FILE_NORMAL,
+                 OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_FAIL_IF_NEW,
+                 OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE | OPEN_FLAGS_DASD,
+                 NULL);
+    if (rc) {
+        mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_MPDEMUX_CDDB_FailedToReadTOC);
+        return -1;
+    }
+
+    rc = DosDevIOCtl(hcd, IOCTL_CDROMAUDIO, CDROMAUDIO_GETAUDIODISK,
+                     auchParamDisk, sizeof(auchParamDisk), &ulParamLen,
+                     &sDataDisk, sizeof(sDataDisk), &ulDataLen);
+    if (!rc) {
+        first = sDataDisk.bFirstTrack - 1;
+        last  = sDataDisk.bLastTrack;
+        for (i = first; i <= last; i++) {
+            if (i == last) {
+                sDataTrack.bStartM = sDataDisk.bLeadOutM;
+                sDataTrack.bStartS = sDataDisk.bLeadOutS;
+                sDataTrack.bStartF = sDataDisk.bLeadOutF;
+            } else {
+                sParamTrack.bTrack = i + 1;
+                rc = DosDevIOCtl(hcd, IOCTL_CDROMAUDIO, CDROMAUDIO_GETAUDIOTRACK,
+                                 &sParamTrack, sizeof(sParamTrack), &ulParamLen,
+                                 &sDataTrack, sizeof(sDataTrack), &ulDataLen);
+                if (rc)
+                    break;
+            }
+
+            cdtoc[i].min   = sDataTrack.bStartM;
+            cdtoc[i].sec   = sDataTrack.bStartS;
+            cdtoc[i].frame = sDataTrack.bStartF;
+        }
+    }
+
+    DosClose(hcd);
+
+    if (rc) {
+        mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_MPDEMUX_CDDB_FailedToReadTOC);
+        return -1;
+    }
 #else
     int drive;
     drive = open(dev, O_RDONLY | O_NONBLOCK);
@@ -349,11 +427,7 @@
 
     sprintf(file_name, "%s%08lx", cddb_data->cache_dir, cddb_data->disc_id);
 
-    file_fd = open(file_name, O_RDONLY
-#if defined(__MINGW32__) || defined(__CYGWIN__)
-    | O_BINARY
-#endif
-   );
+    file_fd = open(file_name, O_RDONLY | O_BINARY);
     if (file_fd < 0) {
         mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_NoCacheFound);
         return -1;