Same dvdnav fixes for HEAD - someone please double check since the interface changed...

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

diff --git a/ext/dvdnav/dvdnavsrc.c b/ext/dvdnav/dvdnavsrc.c
index d54484dd17653435544726b4dcefffa58ad0bb69..a7545f2135d9512011b82951d9b368e186294482 100644 (file)
--- a/ext/dvdnav/dvdnavsrc.c
+++ b/ext/dvdnav/dvdnavsrc.c
@@ -362,7 +362,7 @@ static void
 dvdnavsrc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) 
 {
   DVDNavSrc *src;
-  char *title_string;
+  const char *title_string;
 
   /* it's not null if we got it, but it might not be ours */
   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.
    */
-  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));
     return FALSE;
   }
@@ -712,8 +712,8 @@ dvdnav_get_event_name(int event)
     case DVDNAV_STOP: return "DVDNAV_STOP"; break;
     case DVDNAV_HIGHLIGHT: return "DVDNAV_HIGHLIGHT"; 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_WAIT: return "DVDNAV_WAIT"; break;
   }
   return "UNKNOWN";
 }
@@ -775,28 +775,29 @@ dvdnavsrc_print_event (DVDNavSrc *src, guint8 *data, int event, int len)
       break;
     case DVDNAV_CELL_CHANGE:
       {
-        dvdnav_cell_change_event_t *event = (dvdnav_cell_change_event_t *)data;
-        fprintf (stderr, "  old_cell: %p\n", event->old_cell);
-        fprintf (stderr, "  new_cell: %p\n", event->new_cell);
+        /*dvdnav_cell_change_event_t *event = (dvdnav_cell_change_event_t *)data;*/
+        /*fprintf (stderr, "  old_cell: %p\n", event->old_cell);*/
+        /*fprintf (stderr, "  new_cell: %p\n", event->new_cell);*/
       }
       break;
     case DVDNAV_NAV_PACKET:
       {
+/*
         dvdnav_nav_packet_event_t *event = (dvdnav_nav_packet_event_t *)data;
         pci_t *pci;
         dsi_t *dsi;
-        /*
+
         pci = event->pci;
         dsi = event->dsi;
-        */
+
         pci = dvdnav_get_current_nav_pci(src->dvdnav);
         dsi = dvdnav_get_current_nav_dsi(src->dvdnav);
         fprintf (stderr, "  pci: %p\n", event->pci);
         fprintf (stderr, "  dsi: %p\n", event->dsi);
-        /*
+
         navPrint_PCI(pci);
         navPrint_DSI(dsi);
-        */
+*/
       }
       break;
     case DVDNAV_STOP:
@@ -817,10 +818,10 @@ dvdnavsrc_print_event (DVDNavSrc *src, guint8 *data, int event, int len)
       break;
     case DVDNAV_SPU_CLUT_CHANGE:
       break;
-    case DVDNAV_SEEK_DONE:
-      break;
     case DVDNAV_HOP_CHANNEL:
       break;
+    case DVDNAV_WAIT:
+      break;
     default:
       fprintf (stderr, "  event id: %d\n", event);
       break;
@@ -912,8 +913,8 @@ dvdnavsrc_get (GstPad *pad)
       case DVDNAV_AUDIO_STREAM_CHANGE:
       case DVDNAV_HIGHLIGHT:
       case DVDNAV_SPU_CLUT_CHANGE:
-      case DVDNAV_SEEK_DONE:
       case DVDNAV_HOP_CHANNEL:
+      case DVDNAV_WAIT:
       default:
         dvdnavsrc_print_event (src, data, event, len);
         break;
@@ -1147,7 +1148,7 @@ dvdnavsrc_event (GstPad *pad, GstEvent *event)
                 new_part = part + offset;
                 break;
               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) {
                   goto error;
                 }
@@ -1390,7 +1391,7 @@ dvdnavsrc_query (GstPad *pad, GstQueryType type,
         }
         *value = titles;
       } 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;
         }
         *value = parts;