diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-05-02 18:59:29 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-05-02 18:59:29 +0000 |
| commit | bba4ee0eb4a3c4c3335e56d6f15e8f62ac0592e7 (patch) | |
| tree | e4fecc72ff7d9b491fc56dd203a2f519d58e6d79 | |
| parent | 7f66fdcaf0854942ef481db57123df3c6a515c75 (diff) | |
| download | xine-lib-bba4ee0eb4a3c4c3335e56d6f15e8f62ac0592e7.tar.gz xine-lib-bba4ee0eb4a3c4c3335e56d6f15e8f62ac0592e7.tar.bz2 | |
Declare a logo name constant (better to use in UIs).
CVS patchset: 1838
CVS date: 2002/05/02 18:59:29
| -rw-r--r-- | include/xine.h.tmpl.in | 10 | ||||
| -rw-r--r-- | src/xine-engine/Makefile.am | 4 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 10 |
3 files changed, 13 insertions, 11 deletions
diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in index 11bfca325..1b5d7f4d0 100644 --- a/include/xine.h.tmpl.in +++ b/include/xine.h.tmpl.in @@ -28,7 +28,7 @@ \endverbatim */ /* - * $Id: xine.h.tmpl.in,v 1.94 2002/05/02 12:31:02 f1rmb Exp $ + * $Id: xine.h.tmpl.in,v 1.95 2002/05/02 18:59:29 f1rmb Exp $ * */ @@ -49,7 +49,13 @@ extern "C" { * \def XINE_SKINDIR * Skin file location */ -#define XINE_SKINDIR "@XINE_SKINPATH@" +#define XINE_SKINDIR "@XINE_SKINPATH@" + +/** + * \def XINE_LOGO_FILE + * Default logo file. + */ +#define XINE_LOGO_FILE "file://@XINE_SKINPATH@/xine_logo.mpg" /** * \defgroup build_info Build informations diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index fd5ffa994..89691ec7a 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -2,7 +2,7 @@ ## Process this file with automake to produce Makefile.in ## -CFLAGS = @CFLAGS@ $(THREAD_CFLAGS) +CFLAGS = @CFLAGS@ $(THREAD_CFLAGS) -DXINE_LOGO_FILE=\"file://@XINE_SKINPATH@/xine_logo.mpg\" lib_LTLIBRARIES = libxine.la @@ -28,7 +28,7 @@ noinst_HEADERS = bswap.h @INCLUDED_INTL_TRUE@ @cd $(top_builddir)/intl && $(MAKE) libintl.la debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" + @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) -DXINE_LOGO_FILE=\"file://@XINE_SKINPATH@/xine_logo.mpg\"" install-debug: debug @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 8e5363a54..136f61c03 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.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: xine.c,v 1.125 2002/05/02 12:31:03 f1rmb Exp $ + * $Id: xine.c,v 1.126 2002/05/02 18:59:30 f1rmb Exp $ * * top-level xine functions * @@ -555,16 +555,12 @@ xine_t *xine_init (vo_driver_t *vo, static char *demux_strategies[] = {"default", "reverse", "content", "extension", NULL}; int i; - char default_logo[2048]; - + /* setting default logo mrl */ pthread_mutex_init (&this->logo_lock, NULL); - memset(&default_logo, 0, sizeof(default_logo)); - snprintf(default_logo, 2048, "file://%s/xine_logo.mpg", XINE_SKINDIR); - pthread_mutex_lock (&this->logo_lock); - this->logo_mrl = config->register_string(config, "misc.logo_mrl", default_logo, + this->logo_mrl = config->register_string(config, "misc.logo_mrl", XINE_LOGO_FILE, "logo mrl, displayed in video output window", NULL, _logo_change_cb, (void *) this); pthread_mutex_unlock (&this->logo_lock); |