RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-13 10:26:09 +00:00
Code Issues Releases Wiki Activity

Move DEFAULT_CDROM_DEVICE/DEFAULT_DVD_DEVICE to stream.h where it belongs.

Browse Source 
config.h should only contain option definitions, no logic.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27787 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-10-16 18:28:38 +00:00
parent 7136bb0105
commit 629db77d89
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
configure vendored
View File

@ -8204,33 +8204,6 @@ $_def_dvdnav
$_def_vcd
#ifdef __sun
#define DEFAULT_CDROM_DEVICE "/vol/dev/aliases/cdrom0"
#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
#elif defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__)
#define DEFAULT_CDROM_DEVICE "D:"
#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
#elif defined(__APPLE__) || defined(__DARWIN__)
#define DEFAULT_CDROM_DEVICE "/dev/disk1"
#define DEFAULT_DVD_DEVICE "/dev/rdiskN"
#elif defined(__OpenBSD__)
#define DEFAULT_CDROM_DEVICE "/dev/rcd0a"
#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#define DEFAULT_CDROM_DEVICE "/dev/acd0"
#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
#elif defined(__DragonFly__)
#define DEFAULT_CDROM_DEVICE "/dev/cd0"
#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
#elif defined(__AMIGAOS4__)
#define DEFAULT_CDROM_DEVICE "a1ide.device:2"
#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
#else
#define DEFAULT_CDROM_DEVICE "/dev/cdrom"
#define DEFAULT_DVD_DEVICE "/dev/dvd"
#endif
/* define this to use iconv(3) function to codepage conversions */
$_def_iconv

27
stream/stream.h
View File

@ -65,6 +65,33 @@
#define STREAM_CTRL_GET_ANGLE 10
#define STREAM_CTRL_SET_ANGLE 11
#ifdef __sun
#define DEFAULT_CDROM_DEVICE "/vol/dev/aliases/cdrom0"
#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
#elif defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__)
#define DEFAULT_CDROM_DEVICE "D:"
#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
#elif defined(__APPLE__) || defined(__DARWIN__)
#define DEFAULT_CDROM_DEVICE "/dev/disk1"
#define DEFAULT_DVD_DEVICE "/dev/rdiskN"
#elif defined(__OpenBSD__)
#define DEFAULT_CDROM_DEVICE "/dev/rcd0a"
#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#define DEFAULT_CDROM_DEVICE "/dev/acd0"
#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
#elif defined(__DragonFly__)
#define DEFAULT_CDROM_DEVICE "/dev/cd0"
#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
#elif defined(__AMIGAOS4__)
#define DEFAULT_CDROM_DEVICE "a1ide.device:2"
#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
#else
#define DEFAULT_CDROM_DEVICE "/dev/cdrom"
#define DEFAULT_DVD_DEVICE "/dev/dvd"
#endif
#ifdef CONFIG_NETWORK
#include "network.h"
#endif