mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

Same dvdnav fixes for HEAD - someone please double check since the interface changed and I have no clue what all this...

Browse source 
Original commit message from CVS:
Same dvdnav fixes for HEAD - someone please double check since the interface changed and I have no clue what all this means
This commit is contained in:
Ronald S. Bultje 2003-04-13 18:08:42 +00:00
parent 4bd919792f
commit 8e15349b51
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ext/dvdnav/dvdnavsrc.c
View file

@ -362,7 +362,7 @@ static void
dvdnavsrc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) dvdnavsrc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{ {
DVDNavSrc *src; DVDNavSrc *src;
char *title_string; const char *title_string;
/* it's not null if we got it, but it might not be ours */ /* it's not null if we got it, but it might not be ours */
g_return_if_fail (GST_IS_DVDNAVSRC (object)); g_return_if_fail (GST_IS_DVDNAVSRC (object));
@ -445,7 +445,7 @@ dvdnavsrc_tca_seek(DVDNavSrc *src, int title, int chapter, int angle)
/** /**
* Make sure the chapter number is valid for this title. * Make sure the chapter number is valid for this title.
*/ */
if (dvdnav_get_number_of_programs (src->dvdnav, &programs) != DVDNAV_STATUS_OK) { if (dvdnav_get_number_of_titles (src->dvdnav, &programs) != DVDNAV_STATUS_OK) {
fprintf( stderr, "dvdnav_get_number_of_programs error: %s\n", dvdnav_err_to_string(src->dvdnav)); fprintf( stderr, "dvdnav_get_number_of_programs error: %s\n", dvdnav_err_to_string(src->dvdnav));
return FALSE; return FALSE;
} }
@ -712,8 +712,8 @@ dvdnav_get_event_name(int event)
case DVDNAV_STOP: return "DVDNAV_STOP"; break; case DVDNAV_STOP: return "DVDNAV_STOP"; break;
case DVDNAV_HIGHLIGHT: return "DVDNAV_HIGHLIGHT"; break; case DVDNAV_HIGHLIGHT: return "DVDNAV_HIGHLIGHT"; break;
case DVDNAV_SPU_CLUT_CHANGE: return "DVDNAV_SPU_CLUT_CHANGE"; break; case DVDNAV_SPU_CLUT_CHANGE: return "DVDNAV_SPU_CLUT_CHANGE"; break;
case DVDNAV_SEEK_DONE: return "DVDNAV_SEEK_DONE"; break;
case DVDNAV_HOP_CHANNEL: return "DVDNAV_HOP_CHANNEL"; break; case DVDNAV_HOP_CHANNEL: return "DVDNAV_HOP_CHANNEL"; break;
case DVDNAV_WAIT: return "DVDNAV_WAIT"; break;
} }
return "UNKNOWN"; return "UNKNOWN";
} }
@ -775,28 +775,29 @@ dvdnavsrc_print_event (DVDNavSrc *src, guint8 *data, int event, int len)
break; break;
case DVDNAV_CELL_CHANGE: case DVDNAV_CELL_CHANGE:
{ {
dvdnav_cell_change_event_t *event = (dvdnav_cell_change_event_t *)data; /*dvdnav_cell_change_event_t *event = (dvdnav_cell_change_event_t *)data;*/
fprintf (stderr, " old_cell: %p\n", event->old_cell); /*fprintf (stderr, " old_cell: %p\n", event->old_cell);*/
fprintf (stderr, " new_cell: %p\n", event->new_cell); /*fprintf (stderr, " new_cell: %p\n", event->new_cell);*/
} }
break; break;
case DVDNAV_NAV_PACKET: case DVDNAV_NAV_PACKET:
{ {
/*
dvdnav_nav_packet_event_t *event = (dvdnav_nav_packet_event_t *)data; dvdnav_nav_packet_event_t *event = (dvdnav_nav_packet_event_t *)data;
pci_t *pci; pci_t *pci;
dsi_t *dsi; dsi_t *dsi;
/*
pci = event->pci; pci = event->pci;
dsi = event->dsi; dsi = event->dsi;
*/
pci = dvdnav_get_current_nav_pci(src->dvdnav); pci = dvdnav_get_current_nav_pci(src->dvdnav);
dsi = dvdnav_get_current_nav_dsi(src->dvdnav); dsi = dvdnav_get_current_nav_dsi(src->dvdnav);
fprintf (stderr, " pci: %p\n", event->pci); fprintf (stderr, " pci: %p\n", event->pci);
fprintf (stderr, " dsi: %p\n", event->dsi); fprintf (stderr, " dsi: %p\n", event->dsi);
/*
navPrint_PCI(pci); navPrint_PCI(pci);
navPrint_DSI(dsi); navPrint_DSI(dsi);
*/ */
} }
break; break;
case DVDNAV_STOP: case DVDNAV_STOP:
@ -817,10 +818,10 @@ dvdnavsrc_print_event (DVDNavSrc *src, guint8 *data, int event, int len)
break; break;
case DVDNAV_SPU_CLUT_CHANGE: case DVDNAV_SPU_CLUT_CHANGE:
break; break;
case DVDNAV_SEEK_DONE:
break;
case DVDNAV_HOP_CHANNEL: case DVDNAV_HOP_CHANNEL:
break; break;
case DVDNAV_WAIT:
break;
default: default:
fprintf (stderr, " event id: %d\n", event); fprintf (stderr, " event id: %d\n", event);
break; break;
@ -912,8 +913,8 @@ dvdnavsrc_get (GstPad *pad)
case DVDNAV_AUDIO_STREAM_CHANGE: case DVDNAV_AUDIO_STREAM_CHANGE:
case DVDNAV_HIGHLIGHT: case DVDNAV_HIGHLIGHT:
case DVDNAV_SPU_CLUT_CHANGE: case DVDNAV_SPU_CLUT_CHANGE:
case DVDNAV_SEEK_DONE:
case DVDNAV_HOP_CHANNEL: case DVDNAV_HOP_CHANNEL:
case DVDNAV_WAIT:
default: default:
dvdnavsrc_print_event (src, data, event, len); dvdnavsrc_print_event (src, data, event, len);
break; break;
@ -1147,7 +1148,7 @@ dvdnavsrc_event (GstPad *pad, GstEvent *event)
new_part = part + offset; new_part = part + offset;
break; break;
case GST_SEEK_METHOD_END: case GST_SEEK_METHOD_END:
if (dvdnav_get_number_of_programs(src->dvdnav, &parts) != if (dvdnav_get_number_of_titles(src->dvdnav, &parts) !=
DVDNAV_STATUS_OK) { DVDNAV_STATUS_OK) {
goto error; goto error;
} }
@ -1390,7 +1391,7 @@ dvdnavsrc_query (GstPad *pad, GstQueryType type,
} }
*value = titles; *value = titles;
} else if (*format == chapter_format) { } else if (*format == chapter_format) {
if (dvdnav_get_number_of_programs(src->dvdnav, &parts) != DVDNAV_STATUS_OK) { if (dvdnav_get_number_of_titles(src->dvdnav, &parts) != DVDNAV_STATUS_OK) {
res = FALSE; res = FALSE;
} }
*value = parts; *value = parts;