# include "config.h"
#endif
+#include <vlc_common.h>
#include <vlc/vlc.h>
+#include <vlc_modules.h>
/* evil hack */
#undef __PLUGIN__
#undef __BUILTIN__
#include <../src/modules/modules.h>
-void ParseModules( libvlc_int_t *p_libvlc, mumap &mods, mcmap &mods2 );
-void PrintModuleList( libvlc_int_t *p_libvlc, mumap &mods, mcmap &mods2 );
+void ParseModules( mumap &mods, mcmap &mods2 );
+void PrintModuleList( mumap &mods, mcmap &mods2 );
void ParseOption( module_config_t *p_item, mumap &mods, mcmap &mods2 );
void PrintOption( char *psz_option, char i_short, char *psz_exlusive,
char *psz_text, char *psz_longtext, char *psz_args );
mumap mods;
mcmap mods2;
/* Create a libvlc structure */
- int i_ret = VLC_Create();
- libvlc_int_t *p_libvlc;
+ const char *argv[i_argc + 1];
+ argv[0] = "vlc";
+ for( int i = 0; i < i_argc; i++ )
+ argv[i+1] = ppsz_argv[i];
+ libvlc_instance_t *p_libvlc_instance = libvlc_new(i_argc+1, argv);
- if( i_ret < 0 )
+ if( !p_libvlc_instance )
{
- return i_ret;
+ return 1;
}
- /* Initialize libvlc */
- i_ret = VLC_Init( 0, i_argc, ppsz_argv );
- if( i_ret < 0 )
- {
- VLC_Destroy( 0 );
- return i_ret;
- }
- p_libvlc = (libvlc_int_t*)vlc_object_get( i_ret );
- printf("#compdef vlc\n\n"
+ printf("#compdef vlc cvlc rvlc svlc mvlc qvlc nvlc\n\n"
"#This file is autogenerated by zsh.cpp\n"
"typeset -A opt_args\n"
"local context state line ret=1\n"
"local modules\n\n" );
- PrintModuleList( p_libvlc, mods, mods2 );
+ PrintModuleList( mods, mods2 );
printf( "_arguments -S -s \\\n" );
- ParseModules( p_libvlc, mods, mods2 );
+ ParseModules( mods, mods2 );
printf( " \"(--module)-p[print help on module]:print help on module:($modules)\"\\\n" );
printf( " \"(-p)--module[print help on module]:print help on module:($modules)\"\\\n" );
printf( " \"(--help)-h[print help]\"\\\n" );
printf( " \"(-H)--longhelp[print detailed help]\"\\\n" );
printf( " \"(--list)-l[print a list of available modules]\"\\\n" );
printf( " \"(-l)--list[print a list of available modules]\"\\\n" );
- printf( " \"--save-config[save the current command line options in the config file]\"\\\n" );
printf( " \"--reset-config[reset the current config to the default values]\"\\\n" );
printf( " \"--config[use alternate config file]\"\\\n" );
printf( " \"--reset-plugins-cache[resets the current plugins cache]\"\\\n" );
printf( "return ret\n" );
- /* Exit early since we did not release all the objects we used,
- * but we don't care, our task is over */
- return 0;
-
- /* Finish the threads */
- VLC_CleanUp( 0 );
-
- /* Destroy the libvlc structure */
- VLC_Destroy( 0 );
-
- return i_ret;
+ libvlc_release( p_libvlc_instance );
+ return 0;
}
-void ParseModules( libvlc_int_t *p_libvlc, mumap &mods, mcmap &mods2 )
+void ParseModules( mumap &mods, mcmap &mods2 )
{
- vlc_list_t *p_list = NULL;;
+ module_t **p_list;
module_t *p_module;
module_config_t *p_item;
int i_index;
int i_items;
+ size_t i_modules;
/* List the plugins */
- p_list = vlc_list_find( p_libvlc, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ p_list = module_list_get(&i_modules);
if( !p_list ) return;
- for( i_index = 0; i_index < p_list->i_count; i_index++ )
+ for( i_index = 0; i_index < i_modules; i_index++ )
{
- p_module = (module_t *)p_list->p_values[i_index].p_object;
+ p_module = p_list[i_index];
/* Exclude empty plugins (submodules don't have config options, they
* are stored in the parent module) */
if( p_item->i_type & CONFIG_ITEM )
ParseOption( p_item, mods, mods2 );
}
- while( i_items++ < p_module->i_config_items && p_item++ );
+ while( ++i_items < p_module->confsize && p_item++ );
}
+ module_list_free( p_list );
}
-void PrintModuleList( libvlc_int_t *p_libvlc, mumap &mods, mcmap &mods2 )
+void PrintModuleList( mumap &mods, mcmap &mods2 )
{
- vlc_list_t *p_list = NULL;;
+ module_t **p_list = NULL;
module_t *p_module;
int i_index;
int i_items;
+ size_t i_modules;
/* List the plugins */
- p_list = vlc_list_find( p_libvlc, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ p_list = module_list_get(&i_modules);
if( !p_list ) return;
printf( "modules=\"" );
- for( i_index = 0; i_index < p_list->i_count; i_index++ )
+ for( i_index = 0; i_index < i_modules; i_index++ )
{
- p_module = (module_t *)p_list->p_values[i_index].p_object;
+ p_module = p_list[i_index];
/* Exclude empty plugins (submodules don't have config options, they
* are stored in the parent module) */
}
printf( "\"\n\n" );
+ module_list_free( p_list );
return;
}
void ParseOption( module_config_t *p_item, mumap &mods, mcmap &mods2 )
{
- char *psz_arguments = strdup( "" );
+ char *psz_arguments = NULL;
char *psz_exclusive;
char *psz_option;
char *psz_name;
{
std::pair<mumap::iterator, mumap::iterator> range = mods.equal_range( p_item->psz_type );
std::string list = (*range.first).second;
- ++range.first;
- while( range.first != range.second )
+ if( range.first != range.second )
{
- list = list.append( " " );
- list = list.append( range.first->second );
- ++range.first;
+ while( range.first++ != range.second )
+ {
+ list = list.append( " " );
+ list = list.append( range.first->second );
+ }
+ asprintf( &psz_arguments, "(%s)", list.c_str() );
}
- asprintf( &psz_arguments, "(%s)", list.c_str() );
}
break;
case CONFIG_ITEM_MODULE_CAT:
std::pair<mcmap::iterator, mcmap::iterator> range =
mods2.equal_range( p_item->min.i );
std::string list = (*range.first).second;
- ++range.first;
- while( range.first != range.second )
+ if( range.first != range.second )
{
- list = list.append( " " );
- list = list.append( range.first->second );
- ++range.first;
+ while( range.first++ != range.second )
+ {
+ list = list.append( " " );
+ list = list.append( range.first->second );
+ }
+ asprintf( &psz_arguments, "(%s)", list.c_str() );
}
- asprintf( &psz_arguments, "(%s)", list.c_str() );
}
break;
case CONFIG_ITEM_MODULE_LIST_CAT:
list = list.append( "'" );
++range.first;
}
- asprintf( &psz_arguments, "%s", list.c_str() );
+ psz_arguments = strdup( list.c_str() );
}
break;
int i = p_item->i_list -1;
char *psz_list;
if( p_item->ppsz_list_text )
- asprintf( &psz_list, "%s\\:%s", p_item->ppsz_list[i],
+ asprintf( &psz_list, "%s\\:\\\"%s\\\"", p_item->ppsz_list[i],
p_item->ppsz_list_text[i] );
else
psz_list = strdup(p_item->ppsz_list[i]);
while( i>1 )
{
if( p_item->ppsz_list_text )
- asprintf( &psz_list2, "%s\\:%s %s", p_item->ppsz_list[i-1],
+ asprintf( &psz_list2, "%s\\:\\\"%s\\\" %s", p_item->ppsz_list[i-1],
p_item->ppsz_list_text[i-1], psz_list );
else
- asprintf( &psz_list2, "%s %s", p_item->ppsz_list[i-1],
+ asprintf( &psz_list2, "\\\"%s\\\" %s", p_item->ppsz_list[i-1],
psz_list );
free( psz_list );
int i = p_item->i_list -1;
char *psz_list;
if( p_item->ppsz_list_text )
- asprintf( &psz_list, "%d\\:%s", p_item->pi_list[i],
+ asprintf( &psz_list, "%d\\:\\\"%s\\\"", p_item->pi_list[i],
p_item->ppsz_list_text[i] );
else
psz_list = strdup(p_item->ppsz_list[i]);
char *psz_list2;
- while( i>1 )
+ while( i > 0 )
{
if( p_item->ppsz_list_text )
- asprintf( &psz_list2, "%d\\:%s %s", p_item->pi_list[i-1],
+ asprintf( &psz_list2, "%d\\:\\\"%s\\\" %s", p_item->pi_list[i-1],
p_item->ppsz_list_text[i-1], psz_list );
else
- asprintf( &psz_list2, "%s %s", p_item->ppsz_list[i-1],
+ asprintf( &psz_list2, "\\\"%s\\\" %s", p_item->ppsz_list[i-1],
psz_list );
free( psz_list );
case CONFIG_ITEM_BOOL:
// p_control = new BoolConfigControl( p_this, p_item, parent );
- psz_arguments = NULL;
asprintf( &psz_exclusive, "--no%s --no-%s", p_item->psz_name,
p_item->psz_name );
psz_name = DUP( p_item->psz_name );
free( psz_name );
free( psz_text );
free( psz_longtext );
+ free( psz_arguments );
}
void PrintOption( char *psz_option, char i_short, char *psz_exclusive,
strchr( psz_longtext, '(' ) ) psz_longtext = psz_text;
if( i_short )
{
- if( !psz_exclusive ) psz_exclusive = strdup( "" );
- else asprintf( &psz_exclusive, " %s", psz_exclusive );
- printf( " \"(-%c%s)--%s%s[%s]", i_short, psz_exclusive,
- psz_option, psz_args?"=":"", psz_text );
+ if( !psz_exclusive )
+ printf( " \"(-%c)--%s%s[%s]", i_short,
+ psz_option, psz_args?"=":"", psz_text );
+ else
+ printf( " \"(-%c%s)--%s%s[%s]", i_short, psz_exclusive,
+ psz_option, psz_args?"=":"", psz_text );
if( psz_args )
printf( ":%s:%s\"\\\n", psz_longtext, psz_args );
else
printf( "\"\\\n" );
- printf( " \"(--%s%s)-%c[%s]", psz_option, psz_exclusive,
+
+ printf( " \"(--%s%s)-%c[%s]", psz_option, psz_exclusive ? psz_exclusive : "",
i_short, psz_text );
if( psz_args )
printf( ":%s:%s\"\\\n", psz_longtext, psz_args );
printf( ":%s:%s\"\\\n", psz_longtext, psz_args );
else
printf( "\"\\\n" );
-
}
}
projects / vlc / blobdiff