diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-06-09 17:31:08 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-06-09 17:31:08 +0000 |
| commit | 5c21abe208938b0dbff4a4fea60b715bb58b9c36 (patch) | |
| tree | b643ba45362a5ab054d3afdb5d23082d5c85443d | |
| parent | f39ea0011b53a39e2ae3044830629e1f33f33e15 (diff) | |
| download | xine-lib-5c21abe208938b0dbff4a4fea60b715bb58b9c36.tar.gz xine-lib-5c21abe208938b0dbff4a4fea60b715bb58b9c36.tar.bz2 | |
two amazingly stupid bugs pointed out by Daniel Mack:
* use the info pointer before increasing it
* the plugin type is just a unit8_t, so (1<<8) is not a good constant
for PLUGIN_NO_UNLOAD, use (1<<6) instead; I hope 64 plugin types will be
enough...
CVS patchset: 6663
CVS date: 2004/06/09 17:31:08
| -rw-r--r-- | src/xine-engine/load_plugins.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/xine_plugin.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 0a73283a7..c4ee50148 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.178 2004/06/08 20:44:27 mroi Exp $ + * $Id: load_plugins.c,v 1.179 2004/06/09 17:31:08 mroi Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -569,8 +569,8 @@ static void collect_plugins(xine_t *this, char *path){ /* get next info either from lib or cache */ if( lib ) { - info++; do_not_unload = (do_not_unload || (info->type & PLUGIN_NO_UNLOAD)); + info++; } else { info = _get_cached_plugin ( this->plugin_catalog->cache, diff --git a/src/xine-engine/xine_plugin.h b/src/xine-engine/xine_plugin.h index 5ed84c6c0..b24451382 100644 --- a/src/xine-engine/xine_plugin.h +++ b/src/xine-engine/xine_plugin.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_plugin.h,v 1.14 2004/06/08 20:44:27 mroi Exp $ + * $Id: xine_plugin.h,v 1.15 2004/06/09 17:31:08 mroi Exp $ * * generic plugin definitions * @@ -44,7 +44,7 @@ /* this flag may be or'ed with type to prevent the plugin loader from unloading * the plugin */ -#define PLUGIN_NO_UNLOAD (1 << 8) +#define PLUGIN_NO_UNLOAD (1 << 6) #define PLUGIN_TYPE_MASK ((1 << 7) - 1) |