Merge back branch 0.8.6-playlist-vlm to trunk.

[vlc] / modules / access / dvdnav.c

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 17d668e8e5f17f0d8de43689145399f3c04a7ae4..f362e3eecf0b7760494ea717edc0a31fb4149f39 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -58,16 +58,16 @@
  *****************************************************************************/
 #define ANGLE_TEXT N_("DVD angle")
 #define ANGLE_LONGTEXT N_( \
-    "Allows you to select the default DVD angle." )
+     "Default DVD angle." )
 
 #define CACHING_TEXT N_("Caching value in ms")
 #define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for DVDnav streams. This "\
-    "value should be set in millisecond units." )
+    "Caching value for DVDs. This "\
+    "value should be set in milliseconds." )
 #define MENU_TEXT N_("Start directly in menu")
 #define MENU_LONGTEXT N_( \
-    "Allows you to start the DVD directly in the main menu. This "\
-    "will try to skip all the useless warnings introductions." )
+    "Start the DVD directly in the main menu. This "\
+    "will try to skip all the useless warning introductions." )
 
 #define LANGUAGE_DEFAULT ("en")
 
@@ -176,13 +176,13 @@ static int Open( vlc_object_t *p_this )
         if( !p_this->b_force ) return VLC_EGENERIC;
 
         psz_name = var_CreateGetString( p_this, "dvd" );
-        if( !psz_name || !*psz_name )
+        if( !psz_name )
         {
-            if( psz_name ) free( psz_name );
-            return VLC_EGENERIC;
+            psz_name = strdup("");
         }
     }
-    else psz_name = strdup( p_demux->psz_path );
+    else
+        psz_name = strdup( p_demux->psz_path );
 
 #ifdef WIN32
     if( psz_name[0] && psz_name[1] == ':' &&
@@ -536,6 +536,20 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             *pi64 = (int64_t)var_GetInteger( p_demux, "dvdnav-caching" ) *1000;
             return VLC_SUCCESS;
 
+        case DEMUX_GET_META:
+        {
+            const char *title_name = NULL;
+
+            dvdnav_get_title_string(p_sys->dvdnav, &title_name);
+            if( (NULL != title_name) && ('\0' != title_name[0]) )
+            {
+                vlc_meta_t *p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
+                vlc_meta_SetTitle( p_meta, title_name );
+                return VLC_SUCCESS;
+            }
+            return VLC_EGENERIC;
+        }
+
         /* TODO implement others */
         default:
             return VLC_EGENERIC;
@@ -708,11 +722,11 @@ static int Demux( demux_t *p_demux )
         msg_Dbg( p_demux, "DVDNAV_CELL_CHANGE" );
         msg_Dbg( p_demux, "     - cellN=%d", event->cellN );
         msg_Dbg( p_demux, "     - pgN=%d", event->pgN );
-        msg_Dbg( p_demux, "     - cell_length=%lld", event->cell_length );
-        msg_Dbg( p_demux, "     - pg_length=%lld", event->pg_length );
-        msg_Dbg( p_demux, "     - pgc_length=%lld", event->pgc_length );
-        msg_Dbg( p_demux, "     - cell_start=%lld", event->cell_start );
-        msg_Dbg( p_demux, "     - pg_start=%lld", event->pg_start );
+        msg_Dbg( p_demux, "     - cell_length="I64Fd, event->cell_length );
+        msg_Dbg( p_demux, "     - pg_length="I64Fd, event->pg_length );
+        msg_Dbg( p_demux, "     - pgc_length="I64Fd, event->pgc_length );
+        msg_Dbg( p_demux, "     - cell_start="I64Fd, event->cell_start );
+        msg_Dbg( p_demux, "     - pg_start="I64Fd, event->pg_start );
 
         /* Store the lenght in time of the current PGC */
         p_sys->i_pgc_length = event->pgc_length / 90 * 1000;
@@ -744,10 +758,10 @@ static int Demux( demux_t *p_demux )
          */
         DemuxBlock( p_demux, packet, i_len );
         if( p_sys->b_spu_change ) 
-       {
-               ButtonUpdate( p_demux, VLC_FALSE );
-               p_sys->b_spu_change = VLC_FALSE;
-       }
+        {
+            ButtonUpdate( p_demux, VLC_FALSE );
+            p_sys->b_spu_change = VLC_FALSE;
+        }
         break;
     }
 
@@ -1368,6 +1382,12 @@ static int ProbeDVD( demux_t *p_demux, char *psz_name )
     uint16_t i_tag_id = 0;
     int i_fd, i_ret;
 
+    if( !*psz_name )
+    {
+        /* Triggers libdvdcss autodetection */
+        return VLC_SUCCESS;
+    }
+
     if( stat( psz_name, &stat_info ) || !S_ISREG( stat_info.st_mode ) )
     {
         /* Let dvdnav_open() do the probing */