[vlc-devel] [PATCH] Added option to disable chapter generation from marks file.

Janne Kujanpää jikuja at iki.fi
Wed Sep 21 19:33:47 CEST 2011


---
 modules/access/vdr.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/modules/access/vdr.c b/modules/access/vdr.c
index 873d93f..9490141 100644
--- a/modules/access/vdr.c
+++ b/modules/access/vdr.c
@@ -94,16 +94,23 @@ static void Close( vlc_object_t * );
 #define FPS_LONGTEXT N_( \
     "Default frame rate for chapter import." )
 
+#define DISABLE_MARKS N_("Disable chapters")
+#define DISABLE_MARKS_LONGTEXT N_( \
+    "Disable chapter generation from marks file.")
+
 vlc_module_begin ()
     set_category( CAT_INPUT )
     set_shortname( N_("VDR") )
     set_help( HELP_TEXT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
     set_description( N_("VDR recordings") )
+    add_usage_hint( N_("/file/to/vdr/recording/dir") )
     add_integer( "vdr-chapter-offset", 0,
         CHAPTER_OFFSET_TEXT, CHAPTER_OFFSET_LONGTEXT, true )
     add_float_with_range( "vdr-fps", 25, 1, 1000,
         FPS_TEXT, FPS_LONGTEXT, true )
+    add_bool( "vdr-disable-marks", false,
+        DISABLE_MARKS, DISABLE_MARKS_LONGTEXT, true )
     set_capability( "access", 60 )
     add_shortcut( "vdr" )
     add_shortcut( "directory" )
@@ -262,7 +269,8 @@ static bool ScanDirectory( access_t *p_access, bool b_strict )
     ImportMeta( p_access );
 
     /* cut marks depend on meta data and file sizes */
-    ImportMarks( p_access );
+    if( !var_InheritBool( p_access, "vdr-disable-marks" ) )
+        ImportMarks( p_access );
 
     return true;
 }
-- 
1.7.6.3




More information about the vlc-devel mailing list