comparison stream/stream_cddb.c @ 30685:7e2f58933cc1

Define O_BINARY if it is undefined. This removes a platform check for open().

30684:dc7ed18ea0df

#include "version.h"
#include "stream.h"
#include "network.h"
#include "libavutil/common.h"

#define DEFAULT_FREEDB_SERVER "freedb.freedb.org"
#define DEFAULT_CACHE_DIR     "/.cddb/"

stream_t* open_cdda(char *dev, char *track);

    if (cddb_data == NULL || cddb_data->cache_dir == NULL)
        return -1;

    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
   );
    if (file_fd < 0) {
        mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_NoCacheFound);
        return -1;
    }

30685:7e2f58933cc1

#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/"

stream_t* open_cdda(char *dev, char *track);

    if (cddb_data == NULL || cddb_data->cache_dir == NULL)
        return -1;

    sprintf(file_name, "%s%08lx", cddb_data->cache_dir, cddb_data->disc_id);

    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;
    }