vlc | branch: master | Pierre Ynard <[email protected]> | Wed Dec 8 22:30:31 2010 +0100| [255b467c9c8503cc721d61ac974d51871ff3303e] | committer: Pierre Ynard
Add option to choose the VoD server module For users who'll want to revert to the old one for whatever reason > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=255b467c9c8503cc721d61ac974d51871ff3303e --- src/input/vlm.c | 2 +- src/libvlc-module.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/input/vlm.c b/src/input/vlm.c index 69f454c..290100a 100644 --- a/src/input/vlm.c +++ b/src/input/vlm.c @@ -736,7 +736,7 @@ static int vlm_ControlMediaAdd( vlm_t *p_vlm, vlm_media_t *p_cfg, int64_t *p_id p_vlm->p_vod = vlc_custom_create( VLC_OBJECT(p_vlm), sizeof( vod_t ), VLC_OBJECT_GENERIC, "vod server" ); vlc_object_attach( p_vlm->p_vod, p_vlm->p_libvlc ); - p_vlm->p_vod->p_module = module_need( p_vlm->p_vod, "vod server", NULL, false ); + p_vlm->p_vod->p_module = module_need( p_vlm->p_vod, "vod server", "$vod-server", false ); if( !p_vlm->p_vod->p_module ) { msg_Err( p_vlm, "cannot find vod server" ); diff --git a/src/libvlc-module.c b/src/libvlc-module.c index bfcdcc8..d6a9849 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -1124,6 +1124,11 @@ static const char *const ppsz_clock_descriptions[] = "the correct demuxer is not automatically detected. You should not "\ "set this as a global option unless you really know what you are doing." ) +#define VOD_SERVER_TEXT N_("VoD server module") +#define VOD_SERVER_LONGTEXT N_( \ + "You can select which VoD server module you want to use. Set this " \ + "to `vod_rtsp' to switch back to the old, legacy module." ) + #define RT_PRIORITY_TEXT N_("Allow real-time priority") #define RT_PRIORITY_LONGTEXT N_( \ "Running VLC in real-time priority will allow for much more precise " \ @@ -2065,6 +2070,8 @@ vlc_module_begin () add_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT, MEMCPY_LONGTEXT, true ) change_need_restart () + add_module( "vod-server", "vod server", NULL, NULL, VOD_SERVER_TEXT, + VOD_SERVER_LONGTEXT, true ) set_section( N_("Plugins" ), NULL ) add_bool( "plugins-cache", true, PLUGINS_CACHE_TEXT, _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
