Rename the sdi module to decklink.

diff --git a/configure.ac b/configure.ac
index 65d4e91150e566747b0cbacffc58e99e99a20f39..8fa684aab396e022c211ad9d6853289dcab4d596 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2136,21 +2136,21 @@ fi
 dnl
 dnl special access module for Blackmagic SDI cards
 dnl
-AC_ARG_ENABLE(sdi,
-  [  --enable-sdi            Blackmagic SDI access module (default enabled)])
-if test "${enable_sdi}" != "no"
+AC_ARG_ENABLE(decklink,
+  [  --enable-decklink       Blackmagic DeckLink SDI access module (default enabled)])
+if test "${enable_decklink}" != "no"
 then
-  AC_ARG_WITH(sdi_sdk,
-    [  --with-sdi-sdk=DIR      Location of Blackmagic SDI SDK],[],[])
-  if test "${with_sdi_sdk}" != "no" -a -n "${with_sdi_sdk}"
+  AC_ARG_WITH(decklink_sdk,
+    [  --with-decklink-sdk=DIR      Location of Blackmagic DeckLink SDI SDK],[],[])
+  if test "${with_decklink_sdk}" != "no" -a -n "${with_decklink_sdk}"
   then
-    VLC_ADD_CPPFLAGS([sdi],[-I${with_sdi_sdk}/include])
+    VLC_ADD_CPPFLAGS([decklink],[-I${with_decklink_sdk}/include])
   fi
-  CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_sdi}"
+  CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_decklink}"
   AC_LANG_PUSH(C++)
   AC_CHECK_HEADERS(DeckLinkAPIDispatch.cpp, [
-    VLC_ADD_PLUGIN([sdi])
-  ],[AC_MSG_WARN(Blackmagic SDI include files not found, sdi disabled)])
+    VLC_ADD_PLUGIN([decklink])
+  ],[AC_MSG_WARN(Blackmagic DeckLink SDI include files not found, decklink disabled)])
   AC_LANG_POP(C++)
   CPPFLAGS="${CPPFLAGS_save}"
 fi

diff --git a/modules/LIST b/modules/LIST
index 8a0314e0d10da756d266b33ecb6c396f446d7105..908a83dfa290c186b844a34e77e7b7df053a137f 100644 (file)
--- a/modules/LIST
+++ b/modules/LIST
@@ -81,6 +81,7 @@ $Id$
  * cvdsub: CVD subtitles decoder
  * dbus: D-Bus control interface
  * dc1394: firewire input module
+ * decklink: input module to read from a Blackmagic SDI card
  * decomp: Decompression module
  * deinterlace: naive deinterlacing filter
  * demux_cdg: Demuxer for CD-G files (Karaoke)
@@ -264,7 +265,6 @@ $Id$
  * schroedinger: Schroedinger video decoder
  * screen: a input module that takes screenshots of the primary monitor
  * sdl_image: SDL-based image decoder
- * sdi: input module to read from a Blackmagic SDI card
  * sharpen: Sharpen video filter
  * shine: MP3 encoder using Shine, a fixed point implementation
  * simple_channel_mixer: channel mixer

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 05395778d6fe9b16b4aabb153b2a9836500d0e51..db45a5fc1b800cdfb61ea175423b005af238971f 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -52,7 +52,7 @@ SOURCES_access_avio = avio.c avio.h
 SOURCES_access_attachment = attachment.c
 SOURCES_access_vdr = vdr.c
 SOURCES_libbluray = bluray.c
-SOURCES_sdi = sdi.cpp
+SOURCES_decklink = decklink.cpp
 
 SOURCES_access_rar = rar/rar.c rar/rar.h rar/access.c
 SOURCES_stream_filter_rar = rar/rar.c rar/rar.h rar/stream.c

diff --git a/modules/access/sdi.cpp b/modules/access/decklink.cpp
similarity index 93%
rename from modules/access/sdi.cpp
rename to modules/access/decklink.cpp
index b842e0180d3d8b9a20935037416ea6068db2f734..abefa5de51e3a977be349caa327e01d5f30c8597 100644 (file)
--- a/modules/access/sdi.cpp
+++ b/modules/access/decklink.cpp
@@ -75,24 +75,24 @@ vlc_module_begin ()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
 
-    add_integer( "sdi-card-index", 0, NULL,
+    add_integer( "decklink-card-index", 0, NULL,
                  CARD_INDEX_TEXT, CARD_INDEX_LONGTEXT, true )
-    add_string( "sdi-mode", "pal ", NULL,
+    add_string( "decklink-mode", "pal ", NULL,
                  MODE_TEXT, MODE_LONGTEXT, true )
-    add_integer( "sdi-caching", DEFAULT_PTS_DELAY / 1000, NULL,
+    add_integer( "decklink-caching", DEFAULT_PTS_DELAY / 1000, NULL,
                  CACHING_TEXT, CACHING_LONGTEXT, true )
-    add_string( "sdi-audio-connection", 0, NULL,
+    add_string( "decklink-audio-connection", 0, NULL,
                  AUDIO_CONNECTION_TEXT, AUDIO_CONNECTION_LONGTEXT, true )
-    add_integer( "sdi-audio-rate", 48000, NULL,
+    add_integer( "decklink-audio-rate", 48000, NULL,
                  RATE_TEXT, RATE_LONGTEXT, true )
-    add_integer( "sdi-audio-channels", 2, NULL,
+    add_integer( "decklink-audio-channels", 2, NULL,
                  CHANNELS_TEXT, CHANNELS_LONGTEXT, true )
-    add_string( "sdi-video-connection", 0, NULL,
+    add_string( "decklink-video-connection", 0, NULL,
                  VIDEO_CONNECTION_TEXT, VIDEO_CONNECTION_LONGTEXT, true )
-    add_string( "sdi-aspect-ratio", NULL, NULL,
+    add_string( "decklink-aspect-ratio", NULL, NULL,
                 ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, true )
 
-    add_shortcut( "sdi" )
+    add_shortcut( "decklink" )
     set_capability( "access_demux", 10 )
     set_callbacks( Open, Close )
 vlc_module_end ()
@@ -291,7 +291,7 @@ static int Open( vlc_object_t *p_this )
 
     HRESULT result;
 
-    i_card_index = var_InheritInteger( p_demux, "sdi-card-index" );
+    i_card_index = var_InheritInteger( p_demux, "decklink-card-index" );
     for( int i = 0; i <= i_card_index; ++i )
     {
         if( p_sys->p_card )
@@ -336,7 +336,7 @@ static int Open( vlc_object_t *p_this )
         goto finish;
     }
 
-    psz_video_connection = var_CreateGetNonEmptyString( p_demux, "sdi-video-connection" );
+    psz_video_connection = var_CreateGetNonEmptyString( p_demux, "decklink-video-connection" );
     if( psz_video_connection )
     {
         BMDVideoConnection conn;
@@ -354,7 +354,7 @@ static int Open( vlc_object_t *p_this )
             conn = bmdVideoConnectionSVideo;
         else
         {
-            msg_Err( p_demux, "Invalid --sdi-video-connection specified; choose one of " \
+            msg_Err( p_demux, "Invalid --decklink-video-connection specified; choose one of " \
                               "sdi, hdmi, opticalsdi, component, composite, or svideo." );
             ret = VLC_EGENERIC;
             goto finish;
@@ -370,7 +370,7 @@ static int Open( vlc_object_t *p_this )
         }
     }
 
-    psz_audio_connection = var_CreateGetNonEmptyString( p_demux, "sdi-audio-connection" );
+    psz_audio_connection = var_CreateGetNonEmptyString( p_demux, "decklink-audio-connection" );
     if( psz_audio_connection )
     {
         BMDAudioConnection conn;
@@ -382,7 +382,7 @@ static int Open( vlc_object_t *p_this )
             conn = bmdAudioConnectionAnalog;
         else
         {
-            msg_Err( p_demux, "Invalid --sdi-audio-connection specified; choose one of " \
+            msg_Err( p_demux, "Invalid --decklink-audio-connection specified; choose one of " \
                               "embedded, aesebu, or analog." );
             ret = VLC_EGENERIC;
             goto finish;
@@ -408,15 +408,15 @@ static int Open( vlc_object_t *p_this )
         goto finish;
     }
 
-    psz_display_mode = var_InheritString( p_demux, "sdi-mode" );
+    psz_display_mode = var_InheritString( p_demux, "decklink-mode" );
     if( !psz_display_mode || strlen( psz_display_mode ) == 0 || strlen( psz_display_mode ) > 4 ) {
-        msg_Err( p_demux, "Missing or invalid --sdi-mode string" );
+        msg_Err( p_demux, "Missing or invalid --decklink-mode string" );
         ret = VLC_EGENERIC;
         goto finish;
     }
 
     /*
-     * Pad the --sdi-mode string to four characters, so the user can specify e.g. "pal"
+     * Pad the --decklink-mode string to four characters, so the user can specify e.g. "pal"
      * without having to add the trailing space.
      */
     char sz_display_mode_padded[5];
@@ -504,8 +504,8 @@ static int Open( vlc_object_t *p_this )
 
     if( !b_found_mode )
     {
-        msg_Err( p_demux, "Unknown SDI mode specified. " \
-                          "Run VLC with -v --verbose-objects=-all,+sdi " \
+        msg_Err( p_demux, "Unknown video mode specified. " \
+                          "Run VLC with -v --verbose-objects=-all,+decklink " \
                           "to get a list of supported modes." );
         ret = VLC_EGENERIC;
         goto finish;
@@ -520,8 +520,8 @@ static int Open( vlc_object_t *p_this )
     }
 
     /* Set up audio. */
-    p_sys->i_rate = var_InheritInteger( p_demux, "sdi-audio-rate" );
-    p_sys->i_channels = var_InheritInteger( p_demux, "sdi-audio-channels" );
+    p_sys->i_rate = var_InheritInteger( p_demux, "decklink-audio-rate" );
+    p_sys->i_channels = var_InheritInteger( p_demux, "decklink-audio-channels" );
     if( p_sys->i_rate > 0 && p_sys->i_channels > 0 )
     {
         result = p_sys->p_input->EnableAudioInput( p_sys->i_rate, bmdAudioSampleType16bitInteger, p_sys->i_channels );
@@ -556,7 +556,7 @@ static int Open( vlc_object_t *p_this )
     video_fmt.video.i_frame_rate_base = p_sys->i_fps_den;
     video_fmt.i_bitrate = video_fmt.video.i_width * video_fmt.video.i_height * video_fmt.video.i_frame_rate * 2 * 8;
 
-    psz_aspect = var_CreateGetNonEmptyString( p_demux, "sdi-aspect-ratio" );
+    psz_aspect = var_CreateGetNonEmptyString( p_demux, "decklink-aspect-ratio" );
     if( psz_aspect )
     {
         char *psz_denominator = strchr( psz_aspect, ':' );
@@ -586,7 +586,7 @@ static int Open( vlc_object_t *p_this )
     p_sys->p_audio_es = es_out_Add( p_demux->out, &audio_fmt );
 
     /* Update default_pts to a suitable value for access */
-    var_Create( p_demux, "sdi-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Create( p_demux, "decklink-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
 
 finish:
     if( decklink_iterator )
@@ -652,7 +652,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_PTS_DELAY:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            *pi64 = var_GetInteger( p_demux, "sdi-caching" ) * 1000;
+            *pi64 = var_GetInteger( p_demux, "decklink-caching" ) * 1000;
             return VLC_SUCCESS;
 
         case DEMUX_GET_TIME:

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 747dd50ca22ff4d32d18dc85995d28b5470a3570..f3378b7843c344e395eacb0c7a9776d54926d9ac 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -271,7 +271,7 @@ modules/access/screen/screen.c
 modules/access/screen/screen.h
 modules/access/screen/win32.c
 modules/access/screen/xcb.c
-modules/access/sdi.cpp
+modules/access/decklink.cpp
 modules/access/sftp.c
 modules/access/smb.c
 modules/access/tcp.c