comparison cfg-common.h @ 3975:04b2227ab75a

Return of the 'Old-style-DVD-support', with dynamic loading (using libdl) so no more conflict with libdvdread: you can compile in both of libdvdread and libcss support! You can even select libcss.so to load from command line or configuration file, with '-csslib /usr/local/lib/libcss.so' or something similar. Default for this option is /usr/local/lib/libcss.so. Note: libcss version (ver>0.1) with newer API is not supported in this version! This is the first version so stay tuned :)
author lgb
date Fri, 04 Jan 2002 13:08:14 +0000
parents a14b3a600b81
children 9ff9f6ce6799
comparison
equal deleted inserted replaced
3974:90e7917f945f 3975:04b2227ab75a
20 #endif 20 #endif
21 21
22 #ifdef HAVE_LIBCSS 22 #ifdef HAVE_LIBCSS
23 {"dvdauth", &dvd_auth_device, CONF_TYPE_STRING, 0, 0, 0}, 23 {"dvdauth", &dvd_auth_device, CONF_TYPE_STRING, 0, 0, 0},
24 {"dvdkey", &dvdimportkey, CONF_TYPE_STRING, 0, 0, 0}, 24 {"dvdkey", &dvdimportkey, CONF_TYPE_STRING, 0, 0, 0},
25 // {"dvd", "Option -dvd will be \"full disk\" mode, old meaning has been renamed to -dvdauth.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, 25 {"csslib", &css_so, CONF_TYPE_STRING, 0, 0, 0},
26 #else 26 #else
27 // {"dvd", "DVD support was not compiled in. See file DOCS/DVD.\n", 27 {"dvdauth", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
28 // CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0}, 28 {"dvdkey", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
29 #ifdef USE_DVDREAD 29 {"csslib", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
30 {"dvdkey", "MPlayer was compiled with libdvdread support, this option not available.\n",
31 CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
32 {"dvdauth", "MPlayer was compiled with libdvdread support! Use option -dvd !\n",
33 CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
34 #else
35 {"dvdkey", "DVD support was not compiled in. See file DOCS/DVD.\n",
36 CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
37 {"dvdauth", "DVD support was not compiled in. See file DOCS/DVD.\n",
38 CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
39 #endif
40 #endif 30 #endif
41 31
42 // ------------------------- demuxer options -------------------- 32 // ------------------------- demuxer options --------------------
43 33
44 {"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1}, 34 {"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1},