Discussion:
[PATCH] +1
Gregory Petrosyan
2011-10-23 07:04:17 UTC
Permalink
---
Makefile | 4 +++-
job.c | 8 ++++++++
2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 8b21213..cb84a3e 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ job.o cue_utils.o: CFLAGS += $(CUE_CFLAGS)
# programs {{{
cmus-y := \
ape.o browser.o buffer.o cache.o cmdline.o cmus.o command_mode.o comment.o \
- channelmap.o convert.lo cue_utils.o debug.o discid.o editable.o expr.o filters.o \
+ channelmap.o convert.lo debug.o discid.o editable.o expr.o filters.o \
format_print.o gbuf.o glob.o help.o history.o http.o id3.o input.o job.o \
keys.o keyval.o lib.o load_dir.o locking.o mergesort.o misc.o options.o \
output.o pcm.o pl.o play_queue.o player.o \
@@ -42,6 +42,8 @@ cmus-y := \
track.o track_info.o tree.o u_collate.o uchar.o ui_curses.o \
window.o worker.o xstrjoin.o

+cmus-$(CONFIG_CUE) += cue_utils.o
+
$(cmus-y): CFLAGS += $(PTHREAD_CFLAGS) $(NCURSES_CFLAGS) $(ICONV_CFLAGS) $(DL_CFLAGS)

cmus: $(cmus-y) file.o path.o prog.o xmalloc.o
diff --git a/job.c b/job.c
index 289c7b6..e827dff 100644
--- a/job.c
+++ b/job.c
@@ -33,7 +33,9 @@
#include "player.h"
#include "discid.h"
#include "xstrjoin.h"
+#ifdef CONFIG_CUE
#include "cue_utils.h"
+#endif

#include <string.h>
#include <unistd.h>
@@ -64,14 +66,18 @@ static void add_ti(struct track_info *ti)
ti_buffer[ti_buffer_fill++] = ti;
}

+#ifdef CONFIG_CUE
static int add_file_cue(const char *filename);
+#endif

static void add_file(const char *filename)
{
struct track_info *ti;

+#ifdef CONFIG_CUE
if (!is_cue_url(filename) && add_file_cue(filename))
return;
+#endif

cache_lock();
ti = cache_get_ti(filename);
@@ -81,6 +87,7 @@ static void add_file(const char *filename)
add_ti(ti);
}

+#ifdef CONFIG_CUE
static int add_file_cue(const char *filename)
{
int n_tracks;
@@ -106,6 +113,7 @@ static int add_file_cue(const char *filename)
free(cue_filename);
return 1;
}
+#endif

static void add_url(const char *url)
{
--
1.7.4.4


--pWyiEgJYm5f9v55/--
Loading...