[vdr] Re: mplayer.sh feature request: VCD&DVD-playback

[Stefan Reinauer <stepan@suse.de>]

* Steffen Barszus <st_barszus@gmx.de> [030218 22:27]:
> That sounds good. For the libdvdnav it would be good if it could be renamed. 
> Its a bit annoying that the libdvdnav collides with the original one if 
> installed. Is this possible ? 

I made a patch for MPlayer to compile with the latest libdvdnav. 
Maybe this fixes your problem?

  Stefan

-- 
The use of COBOL cripples the mind; its teaching should, therefore, be
regarded as a criminal offense.                      -- E. W. Dijkstra


-- Attached file included as plaintext by Listar --

Binärdateien MPlayer-0.90rc4.orig/cpudetect.o and MPlayer-0.90rc4/cpudetect.o sind verschieden.
diff -urN MPlayer-0.90rc4.orig/libmpdemux/dvdnav_stream.h MPlayer-0.90rc4/libmpdemux/dvdnav_stream.h
--- MPlayer-0.90rc4.orig/libmpdemux/dvdnav_stream.h	2002-04-03 19:50:48.000000000 +0200
+++ MPlayer-0.90rc4/libmpdemux/dvdnav_stream.h	2003-02-15 17:08:15.000000000 +0100
@@ -11,6 +11,7 @@
 
 typedef struct {
   dvdnav_t *       dvdnav;              /* handle to libdvdnav stuff */
+  pci_t *          current_pci;		/* PCI */
   char *           filename;            /* path */
   int              ignore_timers;       /* should timers be skipped? */
   int              sleeping;            /* are we sleeping? */
Binärdateien MPlayer-0.90rc4.orig/mp_msg.o and MPlayer-0.90rc4/mp_msg.o sind verschieden.
diff -urN MPlayer-0.90rc4.orig/mplayer.c MPlayer-0.90rc4/mplayer.c
--- MPlayer-0.90rc4.orig/mplayer.c	2003-02-09 14:17:12.000000000 +0100
+++ MPlayer-0.90rc4/mplayer.c	2003-02-15 17:15:59.000000000 +0100
@@ -2930,7 +2930,10 @@
         break;
         }
       case DVDNAV_NAV_PACKET: {
-        // printf("DVDNAV Event: Nav Packet\n");
+#ifndef DVDNAV_OLDAPI
+        printf("DVDNAV Event: Nav Packet\n");
+	dvdnav_priv->current_pci = dvdnav_get_current_nav_pci(dvdnav_priv->dvdnav);
+#endif	
         break;
         }
       case DVDNAV_SPU_CLUT_CHANGE: {
@@ -2961,23 +2964,48 @@
 
       switch (cmd->args[0].v.i) {
         case MP_CMD_DVDNAV_UP:
-          dvdnav_upper_button_select(dvdnav_priv->dvdnav);
+#ifndef DVDNAV_OLDAPI
+	  if (dvdnav_priv->current_pci)
+            dvdnav_upper_button_select(dvdnav_priv->dvdnav, dvdnav_priv->current_pci);
+#else
+	  dvdnav_upper_button_select(dvdnav_priv->dvdnav);
+#endif
           break;
         case MP_CMD_DVDNAV_DOWN:
-          dvdnav_lower_button_select(dvdnav_priv->dvdnav);
+#ifndef DVDNAV_OLDAPI
+	  if (dvdnav_priv->current_pci)
+            dvdnav_lower_button_select(dvdnav_priv->dvdnav, dvdnav_priv->current_pci);
+#else
+	  dvdnav_lower_button_select(dvdnav_priv->dvdnav);
+#endif
           break;
         case MP_CMD_DVDNAV_LEFT:
-          dvdnav_left_button_select(dvdnav_priv->dvdnav);
+#ifndef DVDNAV_OLDAPI
+	  if (dvdnav_priv->current_pci)
+            dvdnav_left_button_select(dvdnav_priv->dvdnav, dvdnav_priv->current_pci);
+#else
+	  dvdnav_left_button_select(dvdnav_priv->dvdnav);
+#endif
           break;
         case MP_CMD_DVDNAV_RIGHT:
-          dvdnav_right_button_select(dvdnav_priv->dvdnav);
+#ifndef DVDNAV_OLDAPI
+	  if (dvdnav_priv->current_pci)
+            dvdnav_right_button_select(dvdnav_priv->dvdnav, dvdnav_priv->current_pci);
+#else
+	  dvdnav_right_button_select(dvdnav_priv->dvdnav);
+#endif
           break;
         case MP_CMD_DVDNAV_MENU:
           printf("Menu call\n");
           dvdnav_menu_call(dvdnav_priv->dvdnav,DVD_MENU_Root);
           break;
         case MP_CMD_DVDNAV_SELECT:
-          dvdnav_button_activate(dvdnav_priv->dvdnav);
+#ifndef DVDNAV_OLDAPI
+	  if (dvdnav_priv->current_pci)
+            dvdnav_button_activate(dvdnav_priv->dvdnav, dvdnav_priv->current_pci);
+#else
+	  dvdnav_button_activate(dvdnav_priv->dvdnav);
+#endif
           break;
         default:
           mp_msg(MSGT_CPLAYER, MSGL_V, "Weird DVD Nav cmd %d\n",cmd->args[0].v.i);
Binärdateien MPlayer-0.90rc4.orig/mplayer.o and MPlayer-0.90rc4/mplayer.o sind verschieden.



-- 
Info:
To unsubscribe send a mail to listar@linuxtv.org with "unsubscribe vdr" as subject.