diff options
| author | rofafor <rofafor> | 2013-10-28 15:31:45 +0000 |
|---|---|---|
| committer | rofafor <rofafor> | 2013-10-28 15:31:45 +0000 |
| commit | 189b4604c711abbf07cf09c2c213d71ef76e5c02 (patch) | |
| tree | 8ee856940efcbe954400e6e63cf100d2c0f98a1b | |
| parent | 514ebae5c6ad0b0921eb434e299ba54154b0bce8 (diff) | |
| download | xineliboutput-189b4604c711abbf07cf09c2c213d71ef76e5c02.tar.gz xineliboutput-189b4604c711abbf07cf09c2c213d71ef76e5c02.tar.bz2 | |
Fixed a crash in the config initialization.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | config.c | 11 |
2 files changed, 7 insertions, 9 deletions
@@ -4,7 +4,7 @@ # See the main source file 'xineliboutput.c' for copyright information and # how to reach the author. # -# $Id: Makefile,v 1.115 2013-10-02 07:51:44 phintuka Exp $ +# $Id: Makefile,v 1.116 2013-10-28 15:31:45 rofafor Exp $ # # The official name of this plugin. @@ -67,6 +67,7 @@ PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(s LIBDIR = $(call PKGCFG,libdir) LOCDIR = $(call PKGCFG,locdir) PLGCFG = $(call PKGCFG,plgcfg) +VIDEODIR = $(call PKGCFG,videodir) TMPDIR ?= /tmp BINDIR ?= /usr/bin @@ -179,7 +180,7 @@ endif DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' \ -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ - -DXINELIBOUTPUT_VERSION='"$(VERSION)"' + -DVIDEODIR='"$(VIDEODIR)"' -DXINELIBOUTPUT_VERSION='"$(VERSION)"' ifdef NOSIGNAL_IMAGE_FILE DEFINES += -DNOSIGNAL_IMAGE_FILE='"$(NOSIGNAL_IMAGE_FILE)"' @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: config.c,v 1.117 2013-10-28 09:14:47 phintuka Exp $ + * $Id: config.c,v 1.118 2013-10-28 15:31:45 rofafor Exp $ * */ @@ -703,15 +703,12 @@ config_t::config_t() { ff_h264_skip_loop_filter = FF_H264_SKIP_LOOPFILTER_auto; strn0cpy(media_root_dir, "/", sizeof(media_root_dir)); -#if defined(APIVERSNUM) && (APIVERSNUM < 20102) +#if defined(APIVERSNUM) && (APIVERSNUM >= 20102) + const char *VideoDirectory = cVideoDirectory::Name() ? cVideoDirectory::Name() : VIDEODIR; +#endif strn0cpy(browse_files_dir, VideoDirectory, sizeof(browse_files_dir)); strn0cpy(browse_music_dir, VideoDirectory, sizeof(browse_music_dir)); strn0cpy(browse_images_dir, VideoDirectory, sizeof(browse_images_dir)); -#else - strn0cpy(browse_files_dir, cVideoDirectory::Name(), sizeof(browse_files_dir)); - strn0cpy(browse_music_dir, cVideoDirectory::Name(), sizeof(browse_music_dir)); - strn0cpy(browse_images_dir, cVideoDirectory::Name(), sizeof(browse_images_dir)); -#endif show_hidden_files = 0; cache_implicit_playlists = 1; enable_id3_scanner = 1; |