[MPlayer-dev-eng] [PATCH] VCD support for OS/2

[Diego Biurrun]

On Fri, Feb 19, 2010 at 12:23:32PM +0900, KO Myung-Hun wrote:
> 
> This patch adds VCD support for OS/2.
> 
> --- stream/vcd_read_os2.h	(revision 0)
> +++ stream/vcd_read_os2.h	(revision 0)
> @@ -0,0 +1,258 @@
> +
> +#ifndef MPLAYER_VCD_READ_OS2_H
> +#define MPLAYER_VCD_READ_OS2_H
> +
> +#define INCL_DOS
> +#define INCL_DOSDEVIOCTL
> +#include <os2.h>
> +
> +#include "mp_msg.h"
> +
> +
> +    if (rc) {
> +        mp_msg(MSGT_STREAM, MSGL_ERR, "DosDevIOCtl(GETAUDIOTRACK) = 0x%lx\n", rc);
> +
> +        return -1;
> +    }
> +
> +
> +    if (rc) {
> +        mp_msg(MSGT_OPEN, MSGL_ERR, "DosDevIOCtl(GETAUDIODISK) = 0x%lx\n", rc);
> +
> +        return NULL;
> +    }
> +
> +            if (rc) {
> +                mp_msg(MSGT_OPEN, MSGL_ERR, "DosDevIOCtl(GETAUDIOTRACK) = 0x%lx\n", rc);
> +
> +                return NULL;
> +            }

I would drop those empty lines in the if-blocks, same below.

> +            mp_msg(MSGT_OPEN, MSGL_INFO, "track %02d:  adr=%d  ctrl=%d  %02d:%02d:%02d\n",
> +                   i,
> +                   sDataTrack.bControlInfo & 0x0F,
> +                   sDataTrack.bControlInfo >> 4,
> +                   sDataTrack.msfStart.bMinute,
> +                   sDataTrack.msfStart.bSecond,
> +                   sDataTrack.msfStart.bFrame);
> +        }
> +        else

} else

> --- stream/stream_vcd.c	(revision 30605)
> +++ stream/stream_vcd.c	(working copy)
> @@ -22,6 +22,12 @@
>  #include <windows.h>
>  #endif
> 
> +#if defined(__OS2__)
> +#define INCL_DOS
> +#define INCL_DOSDEVIOCTL
> +#include <os2.h>
> +#endif

Somehow this seems to be in every other patch you post.
Maybe it could be in a more central place...

Diego