e8d61b3065
- use some CONFIGURE_ENV instead of patching - rearrange/update CONFIGURE_ARGS - many patches no longer relevant - add CD audio support input, tetsing and prodding from brad@
33 lines
1.5 KiB
Plaintext
33 lines
1.5 KiB
Plaintext
$OpenBSD: patch-src_input_input_dvd_c,v 1.2 2007/06/13 10:58:29 jakemsr Exp $
|
|
--- src/input/input_dvd.c.orig Mon Apr 16 18:00:50 2007
|
|
+++ src/input/input_dvd.c Sun May 20 22:40:02 2007
|
|
@@ -119,8 +119,8 @@
|
|
#define DVD_PATH "d:\\"
|
|
#define RDVD_PATH "d:\\"
|
|
#else
|
|
-#define DVD_PATH "/dev/dvd"
|
|
-#define RDVD_PATH "/dev/rdvd"
|
|
+#define DVD_PATH "/dev/rcd0c"
|
|
+#define RDVD_PATH "/dev/rcd0c"
|
|
#endif
|
|
|
|
/* Some misc. defines */
|
|
@@ -609,7 +609,7 @@ static buf_element_t *dvd_plugin_read_block (input_plu
|
|
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
|
|
_("input_dvd: Error getting next block from DVD (%s)\n"), dvdnav_err_to_string(this->dvdnav));
|
|
_x_message(this->stream, XINE_MSG_READ_ERROR,
|
|
- dvdnav_err_to_string(this->dvdnav), NULL);
|
|
+ dvdnav_err_to_string(this->dvdnav), (char *)NULL);
|
|
if (block != buf->mem) dvdnav_free_cache_block(this->dvdnav, block);
|
|
buf->free_buffer(buf);
|
|
return NULL;
|
|
@@ -1498,7 +1498,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen)
|
|
xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_dvd: Error opening DVD device\n"));
|
|
_x_message(this->stream, XINE_MSG_READ_ERROR,
|
|
/* FIXME: see FIXME in dvd_parse_try_open() */
|
|
- (strlen(locator) && !(locator[0] == '/' && locator[1] == '\0')) ? locator : class->dvd_device, NULL);
|
|
+ (strlen(locator) && !(locator[0] == '/' && locator[1] == '\0')) ? locator : class->dvd_device, (char *)NULL);
|
|
return 0;
|
|
}
|
|
|