diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-07-24 18:04:22 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-07-24 18:04:22 +0000 |
| commit | a0b3a159eedea7d6c0d2a4f623f1b764b5a9042b (patch) | |
| tree | 0414681c1d3f2a857418476958af0d6aae85e0e3 /src | |
| parent | f8faac34066751a9220c6fa10a4574d33db9582a (diff) | |
| download | xine-lib-a0b3a159eedea7d6c0d2a4f623f1b764b5a9042b.tar.gz xine-lib-a0b3a159eedea7d6c0d2a4f623f1b764b5a9042b.tar.bz2 | |
just noticed the num_mrls parameter got lost on the way through the xine_engine to the gui so the gui had to rely on a NULL entry in autoplay/mrl lists which in turn leads to excessive use of re/malloc constructs in the input plugins. this should be fixed now
CVS patchset: 343
CVS date: 2001/07/24 18:04:22
Diffstat (limited to 'src')
| -rw-r--r-- | src/xine-engine/load_plugins.c | 14 | ||||
| -rw-r--r-- | src/xine-engine/xine_internal.h | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 023303667..0da9581c6 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: load_plugins.c,v 1.32 2001/07/19 17:53:15 ehasenle Exp $ + * $Id: load_plugins.c,v 1.33 2001/07/24 18:04:22 guenter Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -770,10 +770,10 @@ ao_functions_t *xine_load_audio_output_plugin(config_values_t *config, /** *************************************************************** * Autoplay featured plugins section */ -char **xine_get_autoplay_mrls (xine_t *this, char *plugin_id) { +char **xine_get_autoplay_mrls (xine_t *this, char *plugin_id, int *num_mrls) { input_plugin_t *ip; char **autoplay_mrls = NULL; - int i, n; + int i; if(!this || !plugin_id) return NULL; @@ -789,7 +789,7 @@ char **xine_get_autoplay_mrls (xine_t *this, char *plugin_id) { if(((ip->get_capabilities(ip)) & INPUT_CAP_AUTOPLAY)) { if(ip->get_autoplay_list) - autoplay_mrls = ip->get_autoplay_list(ip, &n); + autoplay_mrls = ip->get_autoplay_list(ip, num_mrls); } goto autoplay_mrls_done; @@ -803,10 +803,10 @@ char **xine_get_autoplay_mrls (xine_t *this, char *plugin_id) { /** *************************************************************** * Browse featured plugins section */ -mrl_t **xine_get_browse_mrls (xine_t *this, char *plugin_id, char *start_mrl) { +mrl_t **xine_get_browse_mrls (xine_t *this, char *plugin_id, char *start_mrl, int *num_mrls) { input_plugin_t *ip; mrl_t **browse_mrls = NULL; - int i, n; + int i; if(!this || !plugin_id) return NULL; @@ -822,7 +822,7 @@ mrl_t **xine_get_browse_mrls (xine_t *this, char *plugin_id, char *start_mrl) { if(((ip->get_capabilities(ip)) & INPUT_CAP_GET_DIR)) { if(ip->get_dir) - browse_mrls = ip->get_dir(ip, start_mrl, &n); + browse_mrls = ip->get_dir(ip, start_mrl, num_mrls); } goto browse_mrls_done; diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index 6dc61410f..36914b64f 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_internal.h,v 1.33 2001/07/19 17:53:15 ehasenle Exp $ + * $Id: xine_internal.h,v 1.34 2001/07/24 18:04:22 guenter Exp $ * */ @@ -289,7 +289,7 @@ char **xine_get_browsable_input_plugin_ids (xine_t *this) ; */ mrl_t **xine_get_browse_mrls (xine_t *this, char *plugin_id, - char *start_mrl); + char *start_mrl, int *num_mrls); /* * autoplay support @@ -304,7 +304,7 @@ char **xine_get_autoplay_input_plugin_ids (xine_t *this) ; /* * get autoplay MRL list for input plugin named <plugin_id> */ -char **xine_get_autoplay_mrls (xine_t *this, char *plugin_id); +char **xine_get_autoplay_mrls (xine_t *this, char *plugin_id, int *num_mrls); /* * internal use only |