[svn-commits] tilghman: trunk r278132 - in /trunk: addons/ apps/ cdr/ cel/ channels/ format...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Jul 20 14:35:09 CDT 2010
Author: tilghman
Date: Tue Jul 20 14:35:02 2010
New Revision: 278132
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=278132
Log:
Add load priority order, such that preload becomes unnecessary in most cases
Modified:
trunk/addons/chan_mobile.c
trunk/addons/res_config_mysql.c
trunk/apps/app_confbridge.c
trunk/apps/app_meetme.c
trunk/apps/app_queue.c
trunk/cdr/cdr_adaptive_odbc.c
trunk/cdr/cdr_csv.c
trunk/cdr/cdr_custom.c
trunk/cdr/cdr_manager.c
trunk/cdr/cdr_odbc.c
trunk/cdr/cdr_pgsql.c
trunk/cdr/cdr_radius.c
trunk/cdr/cdr_sqlite.c
trunk/cdr/cdr_sqlite3_custom.c
trunk/cdr/cdr_syslog.c
trunk/cdr/cdr_tds.c
trunk/cel/cel_adaptive_odbc.c
trunk/cel/cel_custom.c
trunk/cel/cel_manager.c
trunk/cel/cel_pgsql.c
trunk/cel/cel_radius.c
trunk/cel/cel_sqlite3_custom.c
trunk/cel/cel_tds.c
trunk/channels/chan_agent.c
trunk/channels/chan_alsa.c
trunk/channels/chan_bridge.c
trunk/channels/chan_console.c
trunk/channels/chan_dahdi.c
trunk/channels/chan_gtalk.c
trunk/channels/chan_h323.c
trunk/channels/chan_iax2.c
trunk/channels/chan_jingle.c
trunk/channels/chan_local.c
trunk/channels/chan_mgcp.c
trunk/channels/chan_misdn.c
trunk/channels/chan_multicast_rtp.c
trunk/channels/chan_sip.c
trunk/channels/chan_skinny.c
trunk/formats/format_g719.c
trunk/formats/format_g723.c
trunk/formats/format_g726.c
trunk/formats/format_g729.c
trunk/formats/format_gsm.c
trunk/formats/format_h263.c
trunk/formats/format_h264.c
trunk/formats/format_ilbc.c
trunk/formats/format_jpeg.c
trunk/formats/format_ogg_vorbis.c
trunk/formats/format_pcm.c
trunk/formats/format_siren14.c
trunk/formats/format_siren7.c
trunk/formats/format_sln.c
trunk/formats/format_sln16.c
trunk/formats/format_vox.c
trunk/formats/format_wav.c
trunk/formats/format_wav_gsm.c
trunk/funcs/func_curl.c
trunk/funcs/func_devstate.c
trunk/include/asterisk/config.h
trunk/include/asterisk/module.h
trunk/main/asterisk.c
trunk/main/config.c
trunk/main/loader.c
trunk/pbx/pbx_lua.c
trunk/res/res_adsi.c
trunk/res/res_agi.c
trunk/res/res_calendar.c
trunk/res/res_calendar_caldav.c
trunk/res/res_calendar_ews.c
trunk/res/res_calendar_exchange.c
trunk/res/res_calendar_icalendar.c
trunk/res/res_config_curl.c
trunk/res/res_config_ldap.c
trunk/res/res_config_odbc.c
trunk/res/res_config_pgsql.c
trunk/res/res_config_sqlite.c
trunk/res/res_crypto.c
trunk/res/res_curl.c
trunk/res/res_fax.c
trunk/res/res_jabber.c
trunk/res/res_monitor.c
trunk/res/res_musiconhold.c
trunk/res/res_odbc.c
trunk/res/res_rtp_asterisk.c
trunk/res/res_rtp_multicast.c
trunk/res/res_smdi.c
trunk/res/res_speech.c
trunk/res/res_srtp.c
trunk/res/res_timing_dahdi.c
trunk/res/res_timing_kqueue.c
trunk/res/res_timing_pthread.c
trunk/res/res_timing_timerfd.c
Modified: trunk/addons/chan_mobile.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/chan_mobile.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/addons/chan_mobile.c (original)
+++ trunk/addons/chan_mobile.c Tue Jul 20 14:35:02 2010
@@ -4584,7 +4584,8 @@
return AST_MODULE_LOAD_FAILURE;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Bluetooth Mobile Device Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Bluetooth Mobile Device Channel Driver",
.load = load_module,
.unload = unload_module,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: trunk/addons/res_config_mysql.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/res_config_mysql.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/addons/res_config_mysql.c (original)
+++ trunk/addons/res_config_mysql.c Tue Jul 20 14:35:02 2010
@@ -1773,9 +1773,10 @@
return CLI_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MySQL RealTime Configuration Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "MySQL RealTime Configuration Driver",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_REALTIME_DRIVER,
);
Modified: trunk/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_confbridge.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/apps/app_confbridge.c (original)
+++ trunk/apps/app_confbridge.c Tue Jul 20 14:35:02 2010
@@ -819,4 +819,8 @@
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Conference Bridge Application");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Conference Bridge Application",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_DEVSTATE_PROVIDER,
+);
Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Tue Jul 20 14:35:02 2010
@@ -7068,9 +7068,10 @@
return load_config(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MeetMe conference bridge",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "MeetMe conference bridge",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_DEVSTATE_PROVIDER,
);
Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Tue Jul 20 14:35:02 2010
@@ -8188,9 +8188,10 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "True Call Queueing",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "True Call Queueing",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_DEVSTATE_CONSUMER,
);
Modified: trunk/cdr/cdr_adaptive_odbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_adaptive_odbc.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cdr/cdr_adaptive_odbc.c (original)
+++ trunk/cdr/cdr_adaptive_odbc.c Tue Jul 20 14:35:02 2010
@@ -754,9 +754,10 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Adaptive ODBC CDR backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Adaptive ODBC CDR backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: trunk/cdr/cdr_csv.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_csv.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cdr/cdr_csv.c (original)
+++ trunk/cdr/cdr_csv.c Tue Jul 20 14:35:02 2010
@@ -357,8 +357,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Comma Separated Values CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Comma Separated Values CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: trunk/cdr/cdr_custom.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_custom.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cdr/cdr_custom.c (original)
+++ trunk/cdr/cdr_custom.c Tue Jul 20 14:35:02 2010
@@ -211,9 +211,10 @@
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Customizable Comma Separated Values CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable Comma Separated Values CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: trunk/cdr/cdr_manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_manager.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cdr/cdr_manager.c (original)
+++ trunk/cdr/cdr_manager.c Tue Jul 20 14:35:02 2010
@@ -218,8 +218,9 @@
return load_config(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk Manager Interface CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk Manager Interface CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: trunk/cdr/cdr_odbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_odbc.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cdr/cdr_odbc.c (original)
+++ trunk/cdr/cdr_odbc.c Tue Jul 20 14:35:02 2010
@@ -279,8 +279,9 @@
return odbc_load_module(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ODBC CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ODBC CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: trunk/cdr/cdr_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_pgsql.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cdr/cdr_pgsql.c (original)
+++ trunk/cdr/cdr_pgsql.c Tue Jul 20 14:35:02 2010
@@ -587,8 +587,9 @@
return config_module(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "PostgreSQL CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PostgreSQL CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: trunk/cdr/cdr_radius.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_radius.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cdr/cdr_radius.c (original)
+++ trunk/cdr/cdr_radius.c Tue Jul 20 14:35:02 2010
@@ -263,4 +263,8 @@
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "RADIUS CDR Backend");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "RADIUS CDR Backend",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
+ );
Modified: trunk/cdr/cdr_sqlite.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_sqlite.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cdr/cdr_sqlite.c (original)
+++ trunk/cdr/cdr_sqlite.c Tue Jul 20 14:35:02 2010
@@ -238,4 +238,8 @@
return AST_MODULE_LOAD_DECLINE;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "SQLite CDR Backend");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SQLite CDR Backend",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
+);
Modified: trunk/cdr/cdr_sqlite3_custom.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_sqlite3_custom.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cdr/cdr_sqlite3_custom.c (original)
+++ trunk/cdr/cdr_sqlite3_custom.c Tue Jul 20 14:35:02 2010
@@ -354,8 +354,9 @@
return res;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "SQLite3 Custom CDR Module",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SQLite3 Custom CDR Module",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: trunk/cdr/cdr_syslog.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_syslog.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cdr/cdr_syslog.c (original)
+++ trunk/cdr/cdr_syslog.c Tue Jul 20 14:35:02 2010
@@ -271,8 +271,9 @@
return res ? AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Customizable syslog CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable syslog CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: trunk/cdr/cdr_tds.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_tds.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cdr/cdr_tds.c (original)
+++ trunk/cdr/cdr_tds.c Tue Jul 20 14:35:02 2010
@@ -628,8 +628,9 @@
return tds_unload_module();
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "FreeTDS CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "FreeTDS CDR Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: trunk/cel/cel_adaptive_odbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cel/cel_adaptive_odbc.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cel/cel_adaptive_odbc.c (original)
+++ trunk/cel/cel_adaptive_odbc.c Tue Jul 20 14:35:02 2010
@@ -783,9 +783,10 @@
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Adaptive ODBC CEL backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Adaptive ODBC CEL backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: trunk/cel/cel_custom.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cel/cel_custom.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cel/cel_custom.c (original)
+++ trunk/cel/cel_custom.c Tue Jul 20 14:35:02 2010
@@ -208,9 +208,10 @@
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Customizable Comma Separated Values CEL Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable Comma Separated Values CEL Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: trunk/cel/cel_manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cel/cel_manager.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cel/cel_manager.c (original)
+++ trunk/cel/cel_manager.c Tue Jul 20 14:35:02 2010
@@ -168,8 +168,9 @@
return load_config(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk Manager Interface CEL Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk Manager Interface CEL Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: trunk/cel/cel_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cel/cel_pgsql.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cel/cel_pgsql.c (original)
+++ trunk/cel/cel_pgsql.c Tue Jul 20 14:35:02 2010
@@ -561,8 +561,9 @@
return my_load_module(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "PostgreSQL CEL Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PostgreSQL CEL Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: trunk/cel/cel_radius.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cel/cel_radius.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cel/cel_radius.c (original)
+++ trunk/cel/cel_radius.c Tue Jul 20 14:35:02 2010
@@ -251,4 +251,8 @@
}
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "RADIUS CEL Backend");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "RADIUS CEL Backend",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
+);
Modified: trunk/cel/cel_sqlite3_custom.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cel/cel_sqlite3_custom.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cel/cel_sqlite3_custom.c (original)
+++ trunk/cel/cel_sqlite3_custom.c Tue Jul 20 14:35:02 2010
@@ -357,8 +357,9 @@
return res;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "SQLite3 Custom CEL Module",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "SQLite3 Custom CEL Module",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: trunk/cel/cel_tds.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cel/cel_tds.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/cel/cel_tds.c (original)
+++ trunk/cel/cel_tds.c Tue Jul 20 14:35:02 2010
@@ -576,8 +576,9 @@
return tds_unload_module();
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "FreeTDS CEL Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "FreeTDS CEL Backend",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CDR_DRIVER,
);
Modified: trunk/channels/chan_agent.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_agent.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/channels/chan_agent.c (original)
+++ trunk/channels/chan_agent.c Tue Jul 20 14:35:02 2010
@@ -2479,8 +2479,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Agent Proxy Channel",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Agent Proxy Channel",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: trunk/channels/chan_alsa.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_alsa.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/channels/chan_alsa.c (original)
+++ trunk/channels/chan_alsa.c Tue Jul 20 14:35:02 2010
@@ -1009,4 +1009,8 @@
return 0;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ALSA Console Channel Driver");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ALSA Console Channel Driver",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
+ );
Modified: trunk/channels/chan_bridge.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_bridge.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/channels/chan_bridge.c (original)
+++ trunk/channels/chan_bridge.c Tue Jul 20 14:35:02 2010
@@ -242,4 +242,8 @@
return 0;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Bridge Interaction Channel");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Bridge Interaction Channel",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
+);
Modified: trunk/channels/chan_console.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_console.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/channels/chan_console.c (original)
+++ trunk/channels/chan_console.c Tue Jul 20 14:35:02 2010
@@ -1521,8 +1521,9 @@
return load_config(1);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Console Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Console Channel Driver",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Tue Jul 20 14:35:02 2010
@@ -17858,8 +17858,9 @@
* AST_MODULE_INFO(, , "DAHDI Telephony"
*/
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc,
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, tdesc,
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: trunk/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_gtalk.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Tue Jul 20 14:35:02 2010
@@ -2154,8 +2154,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Gtalk Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Gtalk Channel Driver",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: trunk/channels/chan_h323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_h323.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/channels/chan_h323.c (original)
+++ trunk/channels/chan_h323.c Tue Jul 20 14:35:02 2010
@@ -3433,8 +3433,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "The NuFone Network's OpenH323 Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "The NuFone Network's OpenH323 Channel Driver",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: trunk/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Tue Jul 20 14:35:02 2010
@@ -14534,8 +14534,9 @@
return AST_MODULE_LOAD_SUCCESS;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Inter Asterisk eXchange (Ver 2)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Inter Asterisk eXchange (Ver 2)",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: trunk/channels/chan_jingle.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_jingle.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/channels/chan_jingle.c (original)
+++ trunk/channels/chan_jingle.c Tue Jul 20 14:35:02 2010
@@ -1966,8 +1966,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Jingle Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Jingle Channel Driver",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: trunk/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_local.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Tue Jul 20 14:35:02 2010
@@ -1031,4 +1031,8 @@
return 0;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Local Proxy Channel (Note: used internally by other modules)");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Local Proxy Channel (Note: used internally by other modules)",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
+ );
Modified: trunk/channels/chan_mgcp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_mgcp.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/channels/chan_mgcp.c (original)
+++ trunk/channels/chan_mgcp.c Tue Jul 20 14:35:02 2010
@@ -4910,8 +4910,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Media Gateway Control Protocol (MGCP)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Media Gateway Control Protocol (MGCP)",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: trunk/channels/chan_misdn.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Tue Jul 20 14:35:02 2010
@@ -12372,8 +12372,9 @@
}
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Channel driver for mISDN Support (BRI/PRI)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Channel driver for mISDN Support (BRI/PRI)",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: trunk/channels/chan_multicast_rtp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_multicast_rtp.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/channels/chan_multicast_rtp.c (original)
+++ trunk/channels/chan_multicast_rtp.c Tue Jul 20 14:35:02 2010
@@ -184,4 +184,8 @@
return 0;
}
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Multicast RTP Paging Channel");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Multicast RTP Paging Channel",
+ .load = load_module,
+ .unload = unload_module,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
+);
Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Jul 20 14:35:02 2010
@@ -28505,8 +28505,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Session Initiation Protocol (SIP)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Session Initiation Protocol (SIP)",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: trunk/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Tue Jul 20 14:35:02 2010
@@ -7488,8 +7488,9 @@
return 0;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Skinny Client Control Protocol (Skinny)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Skinny Client Control Protocol (Skinny)",
.load = load_module,
.unload = unload_module,
.reload = reload,
+ .load_pri = AST_MODPRI_CHANNEL_DRIVER,
);
Modified: trunk/formats/format_g719.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_g719.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_g719.c (original)
+++ trunk/formats/format_g719.c Tue Jul 20 14:35:02 2010
@@ -133,11 +133,7 @@
static int unload_module(void)
{
return ast_format_unregister(g719_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER,"ITU G.719",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ITU G.719");
Modified: trunk/formats/format_g723.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_g723.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_g723.c (original)
+++ trunk/formats/format_g723.c Tue Jul 20 14:35:02 2010
@@ -147,10 +147,6 @@
static int unload_module(void)
{
return ast_format_unregister(g723_1_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "G.723.1 Simple Timestamp File Format",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "G.723.1 Simple Timestamp File Format");
Modified: trunk/formats/format_g726.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_g726.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_g726.c (original)
+++ trunk/formats/format_g726.c Tue Jul 20 14:35:02 2010
@@ -256,10 +256,6 @@
ast_log(LOG_WARNING, "Failed to unregister format %s.\n", f[i].name);
}
return(0);
-}
-
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw G.726 (16/24/32/40kbps) data",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+}
+
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw G.726 (16/24/32/40kbps) data");
Modified: trunk/formats/format_g729.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_g729.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_g729.c (original)
+++ trunk/formats/format_g729.c Tue Jul 20 14:35:02 2010
@@ -143,10 +143,6 @@
static int unload_module(void)
{
return ast_format_unregister(g729_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw G729 data",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw G729 data");
Modified: trunk/formats/format_gsm.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_gsm.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_gsm.c (original)
+++ trunk/formats/format_gsm.c Tue Jul 20 14:35:02 2010
@@ -167,10 +167,6 @@
static int unload_module(void)
{
return ast_format_unregister(gsm_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw GSM data",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw GSM data");
Modified: trunk/formats/format_h263.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_h263.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_h263.c (original)
+++ trunk/formats/format_h263.c Tue Jul 20 14:35:02 2010
@@ -181,10 +181,6 @@
static int unload_module(void)
{
return ast_format_unregister(h263_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw H.263 data",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw H.263 data");
Modified: trunk/formats/format_h264.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_h264.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_h264.c (original)
+++ trunk/formats/format_h264.c Tue Jul 20 14:35:02 2010
@@ -170,10 +170,6 @@
static int unload_module(void)
{
return ast_format_unregister(h264_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw H.264 data",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw H.264 data");
Modified: trunk/formats/format_ilbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_ilbc.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_ilbc.c (original)
+++ trunk/formats/format_ilbc.c Tue Jul 20 14:35:02 2010
@@ -141,10 +141,6 @@
static int unload_module(void)
{
return ast_format_unregister(ilbc_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw iLBC data",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw iLBC data");
Modified: trunk/formats/format_jpeg.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_jpeg.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_jpeg.c (original)
+++ trunk/formats/format_jpeg.c Tue Jul 20 14:35:02 2010
@@ -110,10 +110,6 @@
ast_image_unregister(&jpeg_format);
return 0;
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "jpeg (joint picture experts group) image format",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "jpeg (joint picture experts group) image format");
Modified: trunk/formats/format_ogg_vorbis.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_ogg_vorbis.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_ogg_vorbis.c (original)
+++ trunk/formats/format_ogg_vorbis.c Tue Jul 20 14:35:02 2010
@@ -556,8 +556,4 @@
return ast_format_unregister(vorbis_f.name);
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "OGG/Vorbis audio",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "OGG/Vorbis audio");
Modified: trunk/formats/format_pcm.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_pcm.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_pcm.c (original)
+++ trunk/formats/format_pcm.c Tue Jul 20 14:35:02 2010
@@ -492,10 +492,6 @@
|| ast_format_unregister(alaw_f.name)
|| ast_format_unregister(au_f.name)
|| ast_format_unregister(g722_f.name);
-}
-
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw/Sun uLaw/ALaw 8KHz (PCM,PCMA,AU), G.722 16Khz",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+}
+
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw/Sun uLaw/ALaw 8KHz (PCM,PCMA,AU), G.722 16Khz");
Modified: trunk/formats/format_siren14.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_siren14.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_siren14.c (original)
+++ trunk/formats/format_siren14.c Tue Jul 20 14:35:02 2010
@@ -133,10 +133,6 @@
static int unload_module(void)
{
return ast_format_unregister(siren14_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ITU G.722.1 Annex C (Siren14, licensed from Polycom)",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ITU G.722.1 Annex C (Siren14, licensed from Polycom)");
Modified: trunk/formats/format_siren7.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_siren7.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_siren7.c (original)
+++ trunk/formats/format_siren7.c Tue Jul 20 14:35:02 2010
@@ -133,10 +133,6 @@
static int unload_module(void)
{
return ast_format_unregister(siren7_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ITU G.722.1 (Siren7, licensed from Polycom)",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ITU G.722.1 (Siren7, licensed from Polycom)");
Modified: trunk/formats/format_sln.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_sln.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_sln.c (original)
+++ trunk/formats/format_sln.c Tue Jul 20 14:35:02 2010
@@ -125,10 +125,6 @@
static int unload_module(void)
{
return ast_format_unregister(slin_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw Signed Linear Audio support (SLN)",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw Signed Linear Audio support (SLN)");
Modified: trunk/formats/format_sln16.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_sln16.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_sln16.c (original)
+++ trunk/formats/format_sln16.c Tue Jul 20 14:35:02 2010
@@ -133,10 +133,6 @@
static int unload_module(void)
{
return ast_format_unregister(slin_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw Signed Linear 16KHz Audio support (SLN16)",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw Signed Linear 16KHz Audio support (SLN16)");
Modified: trunk/formats/format_vox.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_vox.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_vox.c (original)
+++ trunk/formats/format_vox.c Tue Jul 20 14:35:02 2010
@@ -130,10 +130,6 @@
static int unload_module(void)
{
return ast_format_unregister(vox_f.name);
-}
+}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Dialogic VOX (ADPCM) File Format",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Dialogic VOX (ADPCM) File Format");
Modified: trunk/formats/format_wav.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_wav.c?view=diff&rev=278132&r1=278131&r2=278132
==============================================================================
--- trunk/formats/format_wav.c (original)
+++ trunk/formats/format_wav.c Tue Jul 20 14:35:02 2010
@@ -493,10 +493,6 @@
static int unload_module(void)
{
return ast_format_unregister(wav_f.name);
-}
-
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Microsoft WAV format (8000Hz Signed Linear)",
- .load = load_module,
- .unload = unload_module,
- .load_pri = 10,
-);
+}
+
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Microsoft WAV format (8000Hz Signed Linear)");
Modified: trunk/formats/format_wav_gsm.c
[... 737 lines stripped ...]
More information about the svn-commits
mailing list