Author: gmaruzz Date: Sat Feb 14 15:46:57 2009 New Revision: 12015 Log: skypiax: * 1.6 changed CLI mechanism, so disable compilation of our CLIs for 1.6 until our CLIs updated. Works for 1.4 and 1.2 Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile Sat Feb 14 15:46:57 2009 @@ -21,7 +21,8 @@ #AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_160/include #AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_12/include #AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_14/include -AST_INCLUDE_DIR=/home/maruzz/devel/svn_celliax_trunk/asterisk-1.2.rev137401/include +#AST_INCLUDE_DIR=/home/maruzz/devel/svn_celliax_trunk/asterisk-1.2.rev137401/include +AST_INCLUDE_DIR=/home/user/devel/asterisk-1.6.0.5/include #ASTERISK CFLAGS+=-DASTERISK @@ -29,8 +30,8 @@ #ASTERISK VERSION #Uncomment one of the following lines to match your Asterisk series #CFLAGS+=-DASTERISK_VERSION_1_4 -#CFLAGS+=-DASTERISK_VERSION_1_6 -CFLAGS+=-DASTERISK_VERSION_1_2 +CFLAGS+=-DASTERISK_VERSION_1_6 +#CFLAGS+=-DASTERISK_VERSION_1_2 #LINUX SKYPE SUPPORT (Celliax for Cygwin always supports Skype) SKYPE_LIB=-L/usr/X11R6/lib -lX11 Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c Sat Feb 14 15:46:57 2009 @@ -130,6 +130,23 @@ */ struct skypiax_pvt *skypiax_iflist = NULL; +#ifdef ASTERISK_VERSION_1_6 +struct ast_cli_entry myclis[] = { +/* + * CLI do not works since some time on 1.6, they changed the CLI mechanism + */ +#if 0 + AST_CLI_DEFINE(skypiax_console_hangup, "Hangup a call on the console"), + AST_CLI_DEFINE(skypiax_console_dial, "Dial an extension on the console"), + AST_CLI_DEFINE(skypiax_console_playback_boost, "Sets/displays spk boost in dB"), + AST_CLI_DEFINE(skypiax_console_capture_boost, "Sets/displays mic boost in dB"), + AST_CLI_DEFINE(skypiax_console_set_active, "Sets/displays active console"), + AST_CLI_DEFINE(skypiax_console_skype, "Sends a Skype command"), + AST_CLI_DEFINE(skypiax_console_skypiax_dir_import, "imports entries from cellphone"), + AST_CLI_DEFINE(skypiax_console_skypiax, "all things skypiax"), + #endif +}; +#else struct ast_cli_entry myclis[] = { {{"skypiax_hangup", NULL}, skypiax_console_hangup, "Hangup a call on the skypiax_console", @@ -152,6 +169,7 @@ "Write the directoriax.conf file, used by directoriax app", skypiax_console_skypiax_dir_import_usage}, }; +#endif /* IMPLEMENTATION */