From 453657754e29a47664b4da9c146a5306e5da136b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 23 Dec 2007 19:11:43 +0100 Subject: Compile fix. --- src/xine-engine/load_plugins.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 5f0da4cff..b0f0d708a 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -1258,7 +1258,7 @@ void _x_free_input_plugin (xine_stream_t *stream, input_plugin_t *input) { input->dispose(input); if (input->node) { pthread_mutex_lock(&catalog->lock); - dec_node_ref(node); + dec_node_ref(input->node); pthread_mutex_unlock(&catalog->lock); } } @@ -1479,7 +1479,7 @@ void _x_free_demux_plugin (xine_stream_t *stream, demux_plugin_t *demux) { demux->dispose(demux); if (demux->node) { pthread_mutex_lock(&catalog->lock); - dec_node_ref(node); + dec_node_ref(demux->node); pthread_mutex_unlock(&catalog->lock); } } @@ -1974,7 +1974,7 @@ void _x_free_video_decoder (xine_stream_t *stream, video_decoder_t *vd) { if (vd->node) { pthread_mutex_lock (&catalog->lock); - dec_node_ref(node); + dec_node_ref(vd->node); pthread_mutex_unlock (&catalog->lock); } } -- cgit v1.2.3 From 35f0e9716e95fa71a1a7a6a471bb57c55a971d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 23 Dec 2007 21:06:17 +0100 Subject: Mark xine_dispose_internal static. --- src/xine-engine/xine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 48fb46958..f473271ea 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -591,7 +591,7 @@ static int stream_rewire_video(xine_post_out_t *output, void *data) return 1; } -void xine_dispose_internal (xine_stream_t *stream); +static void xine_dispose_internal (xine_stream_t *stream); xine_stream_t *xine_stream_new (xine_t *this, xine_audio_port_t *ao, xine_video_port_t *vo) { @@ -1445,7 +1445,7 @@ int xine_eject (xine_stream_t *stream) { return status; } -void xine_dispose_internal (xine_stream_t *stream) { +static void xine_dispose_internal (xine_stream_t *stream) { xine_list_iterator_t *ite; -- cgit v1.2.3 From 6a39126e82abe48f4b5d4919877f5c0701425d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 23 Dec 2007 23:59:49 +0100 Subject: Ignore .loT files. --- .hgignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgignore b/.hgignore index 38db51c92..973e0a305 100644 --- a/.hgignore +++ b/.hgignore @@ -10,6 +10,7 @@ xine-lib-*.tar.bz2 *.lo *.la *.so +*.loT .libs .deps/* .depend -- cgit v1.2.3 From b52f6b993ff035b14221225538087e5e3aa32384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Mon, 24 Dec 2007 15:12:59 +0100 Subject: Add a new TODO entry: review translable strings. --- TODO | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TODO b/TODO index 103f0468f..81e346b7a 100644 --- a/TODO +++ b/TODO @@ -22,6 +22,8 @@ For 1.2 series - review media_eject_media, possibly rewrite to use libcdio; - improve error reporting (for when demuxer/decoder plugins aren't found); - HTTPS. +- review translable strings, try to follow a defined schema for naming and + error reporting; known bugs ========== -- cgit v1.2.3 From 0e5934002fd660a25d844d0f11fa7d2e53a10297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Mon, 24 Dec 2007 15:24:15 +0100 Subject: Move _x_scan_plugins and _x_dispose_plugins into an internal header, and don't export them anymore. --- include/xine/plugin_catalog.h | 16 -------------- src/xine-engine/Makefile.am | 3 ++- src/xine-engine/load_plugins.c | 2 ++ src/xine-engine/load_plugins.h | 50 ++++++++++++++++++++++++++++++++++++++++++ src/xine-engine/xine.c | 2 ++ 5 files changed, 56 insertions(+), 17 deletions(-) create mode 100644 src/xine-engine/load_plugins.h diff --git a/include/xine/plugin_catalog.h b/include/xine/plugin_catalog.h index 1c2d5e806..be02c3649 100644 --- a/include/xine/plugin_catalog.h +++ b/include/xine/plugin_catalog.h @@ -71,20 +71,4 @@ struct plugin_catalog_s { }; typedef struct plugin_catalog_s plugin_catalog_t; -/* - * load plugins into catalog - * - * all input+demux plugins will be fully loaded+initialized - * decoder plugins are loaded on demand - * video/audio output plugins have special load/probe functions - */ -void _x_scan_plugins (xine_t *this) XINE_PROTECTED; - - -/* - * dispose all currently loaded plugins (shutdown) - */ - -void _x_dispose_plugins (xine_t *this) XINE_PROTECTED; - #endif diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index c509b62af..49757f841 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -24,7 +24,8 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ video_overlay.c osd.c spu.c scratch.c demux.c vo_scale.c \ xine_interface.c post.c broadcaster.c io_helper.c \ input_rip.c input_cache.c info_helper.c refcounter.c \ - alphablend.c + alphablend.c \ + load_plugins.h libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) $(XDG_BASEDIR_DEPS) \ $(pthread_dep) $(LIBXINEPOSIX) diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index b0f0d708a..eae30efe4 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -42,6 +42,8 @@ #include +#include "load_plugins.h" + #define LOG_MODULE "load_plugins" #define LOG_VERBOSE diff --git a/src/xine-engine/load_plugins.h b/src/xine-engine/load_plugins.h new file mode 100644 index 000000000..7e7d3cc93 --- /dev/null +++ b/src/xine-engine/load_plugins.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2007 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA + */ + +/** + * @file + * @brief Internal functions related to the plugin catalog. + * + * @internal This code should not be used by plugins or frontends, it's only + * used by the xine-engine. + */ + +#ifndef __LOAD_PLUGINS_H__ +#define __LOAD_PLUGINS_H__ + +#include + +/* + * load plugins into catalog + * + * all input+demux plugins will be fully loaded+initialized + * decoder plugins are loaded on demand + * video/audio output plugins have special load/probe functions + */ +void _x_scan_plugins (xine_t *this); + + +/* + * dispose all currently loaded plugins (shutdown) + */ + +void _x_dispose_plugins (xine_t *this); + +#endif diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index f473271ea..3da311dfc 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -79,6 +79,8 @@ # include #endif /* WIN32 */ +#include "load_plugins.h" + static void mutex_cleanup (void *mutex) { pthread_mutex_unlock ((pthread_mutex_t *) mutex); -- cgit v1.2.3