annotate src/cue/cuesheet.c @ 2440:5e87f7cc8d13

Remove unneeded vars.
author William Pitcock <nenolod@atheme.org>
date Fri, 07 Mar 2008 15:56:40 -0600
parents 763d8f49612b
children 42a5c9d5830b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
1 /* Audacious: An advanced media player.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
2 * cuesheet.c: Support cuesheets as a media container.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
3 *
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
4 * Copyright (C) 2006 William Pitcock <nenolod -at- nenolod.net>.
2147
e49d9b0ee308 Change my mail.
Jonathan Schleifer <js@h3c.de>
parents: 2075
diff changeset
5 * Jonathan Schleifer <js-audacious@webkeks.org> (few fixes)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
6 *
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
7 * Copyright (C) 2007 Yoshiki Yazawa <yaz@cc.rim.or.jp> (millisecond
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
8 * seek and multithreading)
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
9 *
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
10 * This file was hacked out of of xmms-cueinfo,
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
11 * Copyright (C) 2003 Oskar Liljeblad
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
12 *
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
13 * This software is copyrighted work licensed under the terms of the
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
14 * GNU General Public License. Please consult the file "COPYING" for
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
15 * details.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
16 */
1772
bbebc130f8f5 cue: Mk2, HAVE_CONFIG_H removal, etc
William Pitcock <nenolod@atheme.org>
parents: 1762
diff changeset
17
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
18 #include "config.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
19
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
20 /* #define AUD_DEBUG 1 */
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
21
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
22 #include <string.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
23 #include <stdlib.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
24 #include <stdio.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
25 #include <ctype.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
26 #include <audacious/plugin.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
27 #include <audacious/output.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
28 #include <audacious/playlist.h>
308
1bf162c7b4b9 [svn] - cuesheet plugin improvements via hiro @ audacious boards
nenolod
parents: 251
diff changeset
29 #include <audacious/util.h>
532
04b0c54d16bb [svn] - if the performer of a track is not specified in cue sheet, the performer of the album will be used.
yaz
parents: 520
diff changeset
30 #include <audacious/strings.h>
356
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
31 #include <audacious/main.h>
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
32
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
33 #define MAX_CUE_LINE_LENGTH 1000
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
34 #define MAX_CUE_TRACKS 1000
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
35
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
36 static void cache_cue_file(gchar *f);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
37 static void free_cue_info(void);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
38 static void fix_cue_argument(char *line);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
39 static gboolean is_our_file(gchar *filespec);
559
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
40 static void play(InputPlayback *data);
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
41 static void play_cue_uri(InputPlayback *data, gchar *uri);
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
42 static void seek(InputPlayback *data, gint time);
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
43 static void stop(InputPlayback *data);
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
44 static void cue_pause(InputPlayback *data, short);
1422
35c8b1faf27b update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
45 static Tuple *get_tuple(gchar *uri);
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
46 static Tuple *get_aud_tuple_uri(gchar *uri);
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
47 static void cue_init(void);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
48 static void cue_cleanup(void);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
49 static gpointer watchdog_func(gpointer data);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
50
1364
8916502b398c make sure thread pointer to be NULL if corresponding thread doesn't exist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1363
diff changeset
51 static GThread *watchdog_thread = NULL;
8916502b398c make sure thread pointer to be NULL if corresponding thread doesn't exist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1363
diff changeset
52 static GThread *play_thread = NULL;
8916502b398c make sure thread pointer to be NULL if corresponding thread doesn't exist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1363
diff changeset
53 static GThread *real_play_thread = NULL;
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
54
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
55 static GMutex *cue_mutex;
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
56 static GCond *cue_cond;
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
57 static enum {
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
58 STOP,
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
59 RUN,
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
60 EXIT,
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
61 } watchdog_state;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
62
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
63 static GMutex *cue_block_mutex;
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
64 static GCond *cue_block_cond;
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
65
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
66 static InputPlayback *caller_ip = NULL;
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
67
356
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
68 static gchar *cue_file = NULL;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
69 static gchar *cue_title = NULL;
356
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
70 static gchar *cue_performer = NULL;
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
71 static gchar *cue_genre = NULL;
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
72 static gchar *cue_year = NULL;
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
73 static gchar *cue_track = NULL;
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
74
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
75 static gint last_cue_track = 0;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
76 static gint cur_cue_track = 0;
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
77 static gint target_time = 0;
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
78 static GMutex *cue_target_time_mutex;
356
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
79
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
80 static struct {
356
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
81 gchar *title;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
82 gchar *performer;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
83 gint index;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
84 } cue_tracks[MAX_CUE_TRACKS];
356
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
85
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
86 static gint finetune_seek = 0;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
87
559
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
88 static InputPlayback *real_ip = NULL;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
89
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
90 InputPlugin cue_ip =
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
91 {
1615
41286bab50dc cuesheet: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1597
diff changeset
92 .description = "Cuesheet Plugin", /* description */
41286bab50dc cuesheet: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1597
diff changeset
93 .init = cue_init, /* init */
41286bab50dc cuesheet: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1597
diff changeset
94 .is_our_file = is_our_file,
41286bab50dc cuesheet: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1597
diff changeset
95 .play_file = play,
41286bab50dc cuesheet: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1597
diff changeset
96 .stop = stop,
41286bab50dc cuesheet: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1597
diff changeset
97 .pause = cue_pause,
41286bab50dc cuesheet: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1597
diff changeset
98 .seek = seek,
41286bab50dc cuesheet: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1597
diff changeset
99 .cleanup = cue_cleanup, /* cleanup */
1623
1aee1ff54c8b get_tuple should be get_song_tuple
William Pitcock <nenolod@atheme.org>
parents: 1615
diff changeset
100 .get_song_tuple = get_tuple,
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
101 };
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
102
1088
07914886d6aa [svn] - cue: convert to plugin API v2
nenolod
parents: 987
diff changeset
103 InputPlugin *cue_iplist[] = { &cue_ip, NULL };
07914886d6aa [svn] - cue: convert to plugin API v2
nenolod
parents: 987
diff changeset
104
1395
761e17b23e0c added Discovery plugin type
Cristi Magherusan <majeru@atheme-project.org>
parents: 1376
diff changeset
105 DECLARE_PLUGIN(cue, NULL, NULL, cue_iplist, NULL, NULL, NULL, NULL, NULL);
1088
07914886d6aa [svn] - cue: convert to plugin API v2
nenolod
parents: 987
diff changeset
106
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
107 static void cue_init(void)
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
108 {
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
109 cue_mutex = g_mutex_new();
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
110 cue_cond = g_cond_new();
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
111 cue_block_mutex = g_mutex_new();
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
112 cue_block_cond = g_cond_new();
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
113 cue_target_time_mutex = g_mutex_new();
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
114
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
115 /* create watchdog thread */
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
116 g_mutex_lock(cue_mutex);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
117 watchdog_state = STOP;
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
118 g_mutex_unlock(cue_mutex);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
119 watchdog_thread = g_thread_create(watchdog_func, NULL, TRUE, NULL);
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
120 AUDDBG("watchdog_thread = %p\n", watchdog_thread);
1997
9d0f5be50219 uri_ to aud_uri_
William Pitcock <nenolod@atheme.org>
parents: 1984
diff changeset
121 aud_uri_set_plugin("cue://", &cue_ip);
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
122 }
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
123
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
124 static void cue_cleanup(void)
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
125 {
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
126 g_mutex_lock(cue_mutex);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
127 watchdog_state = EXIT;
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
128 g_mutex_unlock(cue_mutex);
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
129 g_cond_broadcast(cue_cond);
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
130
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
131 g_thread_join(watchdog_thread);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
132
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
133 g_cond_free(cue_cond);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
134 g_mutex_free(cue_mutex);
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
135 g_cond_free(cue_block_cond);
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
136 g_mutex_free(cue_block_mutex);
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
137 g_mutex_free(cue_target_time_mutex);
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
138 }
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
139
76
0b53b7f1959d [svn] - too much was reverted here, only the if (!ext) return TRUE; was wrong.
nenolod
parents: 73
diff changeset
140 static int is_our_file(gchar *filename)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
141 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
142 gchar *ext;
86
60cf31332daa [svn] - some improvements to the cuesheet plugin, not totally there yet ;)
nenolod
parents: 81
diff changeset
143
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
144 /* is it a cue:// URI? */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
145 if (!strncasecmp(filename, "cue://", 6))
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
146 return TRUE;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
147
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
148 ext = strrchr(filename, '.');
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
149
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
150 if(!ext)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
151 return FALSE;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
152
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
153 if (!strncasecmp(ext, ".cue", 4))
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
154 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
155 gint i;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
156
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
157 /* add the files, build cue urls, etc. */
1557
c8c725957643 make cuesheet plugin work again.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1510
diff changeset
158 cache_cue_file(filename); //filename should be uri.
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
159
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
160 for (i = 0; i < last_cue_track; i++)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
161 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
162 gchar _buf[65535];
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
163
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
164 g_snprintf(_buf, 65535, "cue://%s?%d", filename, i);
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2050
diff changeset
165 aud_playlist_add_url(aud_playlist_get_active(), _buf);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
166 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
167
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
168 free_cue_info();
81
254cc9620517 [svn] - fix issue where cuesheet plugin owns all codecs
nenolod
parents: 76
diff changeset
169
254cc9620517 [svn] - fix issue where cuesheet plugin owns all codecs
nenolod
parents: 76
diff changeset
170 return -1;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
171 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
172
81
254cc9620517 [svn] - fix issue where cuesheet plugin owns all codecs
nenolod
parents: 76
diff changeset
173 return FALSE;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
174 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
175
559
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
176 static void play(InputPlayback *data)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
177 {
1557
c8c725957643 make cuesheet plugin work again.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1510
diff changeset
178 gchar *uri = g_strdup(data->filename);
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
179
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
180 AUDDBG("play: playback = %p\n", data);
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
181 AUDDBG("play: uri = %s\n", uri);
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
182
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
183 caller_ip = data;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
184 /* this isn't a cue:// uri? */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
185 if (strncasecmp("cue://", uri, 6))
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
186 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
187 gchar *tmp = g_strdup_printf("cue://%s?0", uri);
1557
c8c725957643 make cuesheet plugin work again.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1510
diff changeset
188 g_free(uri);
c8c725957643 make cuesheet plugin work again.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1510
diff changeset
189 uri = tmp;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
190 }
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
191 play_thread = g_thread_self();
1557
c8c725957643 make cuesheet plugin work again.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1510
diff changeset
192 data->set_pb_ready(data); // it should be done in real input plugin? --yaz
559
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
193 play_cue_uri(data, uri);
1557
c8c725957643 make cuesheet plugin work again.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1510
diff changeset
194 g_free(uri); uri = NULL;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
195 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
196
1422
35c8b1faf27b update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
197 static Tuple *get_tuple(gchar *uri)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
198 {
1422
35c8b1faf27b update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
199 Tuple *ret;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
200
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
201 /* this isn't a cue:// uri? */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
202 if (strncasecmp("cue://", uri, 6))
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
203 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
204 gchar *tmp = g_strdup_printf("cue://%s?0", uri);
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
205 ret = get_aud_tuple_uri(tmp);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
206 g_free(tmp);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
207 return ret;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
208 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
209
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
210 return get_aud_tuple_uri(uri);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
211 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
212
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
213 static void _aud_tuple_copy_field(Tuple *tuple, Tuple *tuple2, const gint nfield, const gchar *field)
1422
35c8b1faf27b update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
214 {
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
215 const gchar *str = aud_tuple_get_string(tuple, nfield, field);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
216 aud_tuple_disassociate(tuple2, nfield, field);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
217 aud_tuple_associate_string(tuple2, nfield, field, str);
1422
35c8b1faf27b update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
218 }
35c8b1faf27b update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
219
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
220 static Tuple *get_aud_tuple_uri(gchar *uri)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
221 {
901
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
222 gchar *path2 = g_strdup(uri + 6);
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
223 gchar *_path = strchr(path2, '?');
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
224 gint track = 0;
308
1bf162c7b4b9 [svn] - cuesheet plugin improvements via hiro @ audacious boards
nenolod
parents: 251
diff changeset
225
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
226 ProbeResult *pr;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
227 InputPlugin *dec;
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
228
2316
62391135da44 fixed some warnings
Cristi Magherusan <majeru@atheme.org>
parents: 2162
diff changeset
229 Tuple *phys_tuple=NULL, *out;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
230
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
231 if (_path != NULL && *_path == '?')
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
232 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
233 *_path = '\0';
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
234 _path++;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
235 track = atoi(_path);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
236 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
237
1557
c8c725957643 make cuesheet plugin work again.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1510
diff changeset
238 cache_cue_file(path2); //path2 should be uri.
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
239
241
a1e15310703e [svn] Crash avoidance for zeroed cue sheets. By TiCPU, submitted in #audacious.
chainsaw
parents: 239
diff changeset
240 if (cue_file == NULL)
a1e15310703e [svn] Crash avoidance for zeroed cue sheets. By TiCPU, submitted in #audacious.
chainsaw
parents: 239
diff changeset
241 return NULL;
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
242
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
243 AUDDBG("cue_file = %s\n", cue_file);
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
244
2073
609169a441a7 update for new API
William Pitcock <nenolod@atheme.org>
parents: 2070
diff changeset
245 pr = aud_input_check_file(cue_file, FALSE);
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
246 if (pr == NULL)
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
247 return NULL;
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
248 dec = pr->ip;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
249 if (dec == NULL)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
250 return NULL;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
251
308
1bf162c7b4b9 [svn] - cuesheet plugin improvements via hiro @ audacious boards
nenolod
parents: 251
diff changeset
252 if (dec->get_song_tuple)
1bf162c7b4b9 [svn] - cuesheet plugin improvements via hiro @ audacious boards
nenolod
parents: 251
diff changeset
253 phys_tuple = dec->get_song_tuple(cue_file);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
254
1422
35c8b1faf27b update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
255 if(!phys_tuple)
35c8b1faf27b update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
256 return NULL;
35c8b1faf27b update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
257
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
258 out = aud_tuple_new();
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
259
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
260 _aud_tuple_copy_field(phys_tuple, out, FIELD_FILE_PATH, NULL);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
261 _aud_tuple_copy_field(phys_tuple, out, FIELD_FILE_NAME, NULL);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
262 _aud_tuple_copy_field(phys_tuple, out, FIELD_FILE_EXT, NULL);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
263 _aud_tuple_copy_field(phys_tuple, out, FIELD_CODEC, NULL);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
264 _aud_tuple_copy_field(phys_tuple, out, FIELD_QUALITY, NULL);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
265 _aud_tuple_copy_field(phys_tuple, out, FIELD_COPYRIGHT, NULL);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
266 _aud_tuple_copy_field(phys_tuple, out, FIELD_COMMENT, NULL);
1192
16413a86172c fix for crash when the file pointed in a cuesheet does not exist. closes #978.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1088
diff changeset
267
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
268 aud_tuple_associate_int(out, FIELD_LENGTH, NULL, aud_tuple_get_int(phys_tuple, FIELD_LENGTH, NULL));
1422
35c8b1faf27b update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
269
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
270 aud_tuple_free(phys_tuple);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
271
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
272 aud_tuple_associate_string(out, FIELD_TITLE, NULL, cue_tracks[track].title);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
273 aud_tuple_associate_string(out, FIELD_ARTIST, NULL, cue_tracks[track].performer ?
532
04b0c54d16bb [svn] - if the performer of a track is not specified in cue sheet, the performer of the album will be used.
yaz
parents: 520
diff changeset
274 cue_tracks[track].performer : cue_performer);
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
275 aud_tuple_associate_string(out, FIELD_ALBUM, NULL, cue_title);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
276 aud_tuple_associate_string(out, FIELD_GENRE, NULL, cue_genre);
1557
c8c725957643 make cuesheet plugin work again.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1510
diff changeset
277 if(cue_year)
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
278 aud_tuple_associate_int(out, FIELD_YEAR, NULL, atoi(cue_year));
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
279 aud_tuple_associate_int(out, FIELD_TRACK_NUMBER, NULL, track + 1);
1422
35c8b1faf27b update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
280
35c8b1faf27b update to new API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
281 return out;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
282 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
283
559
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
284 static void seek(InputPlayback * data, gint time)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
285 {
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
286 g_mutex_lock(cue_target_time_mutex);
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
287 target_time = time * 1000;
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
288 g_mutex_unlock(cue_target_time_mutex);
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
289
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
290 AUDDBG("seek: playback = %p\n", data);
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
291 AUDDBG("cue: seek: target_time = %d\n", target_time);
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
292
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
293 if (real_ip != NULL) {
559
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
294 real_ip->plugin->seek(real_ip, time);
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
295 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
296 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
297
559
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
298 static void stop(InputPlayback * data)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
299 {
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
300 AUDDBG("f: stop: playback = %p\n", data);
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
301
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
302 if(play_thread) {
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
303 if(real_play_thread) {
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
304 g_cond_signal(cue_block_cond); /* kick play_cue_uri */
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
305
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
306 if (real_ip != NULL)
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
307 real_ip->plugin->stop(real_ip);
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
308
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
309 AUDDBG("i: stop(real_ip) finished\n");
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
310
1364
8916502b398c make sure thread pointer to be NULL if corresponding thread doesn't exist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1363
diff changeset
311 real_play_thread = NULL;
8916502b398c make sure thread pointer to be NULL if corresponding thread doesn't exist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1363
diff changeset
312
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
313 if (data != NULL)
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
314 data->playing = 0;
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
315 if (caller_ip != NULL)
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
316 caller_ip->playing = 0;
804
1cc14b1239a1 [svn] - need to clear data->playing when stopped.
yaz
parents: 803
diff changeset
317
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
318 g_mutex_lock(cue_mutex);
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
319 watchdog_state = STOP;
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
320 g_mutex_unlock(cue_mutex);
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
321 g_cond_signal(cue_cond);
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
322
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
323 free_cue_info();
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
324
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
325 if (real_ip != NULL) {
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
326 real_ip->plugin->set_info = cue_ip.set_info;
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
327 real_ip->plugin->output = NULL;
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
328 g_free(real_ip);
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
329 real_ip = NULL;
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
330 }
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
331 } /* real_play_thread */
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
332
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
333 g_thread_join(play_thread);
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
334 play_thread = NULL;
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
335
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
336 } /*play_thread*/
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
337
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
338 AUDDBG("e: stop\n");
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
339 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
340
1274
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
341 static gboolean do_stop(gpointer data)
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
342 {
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
343 AUDDBG("f: do_stop\n");
2068
c8ba6764985d use audacious DRCT API here.
William Pitcock <nenolod@atheme.org>
parents: 2061
diff changeset
344 audacious_drct_stop();
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
345 AUDDBG("e: do_stop\n");
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
346
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
347 return FALSE; //only once
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
348 }
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
349
1274
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
350 static gboolean do_setpos(gpointer data)
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
351 {
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2050
diff changeset
352 Playlist *playlist = aud_playlist_get_active();
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2050
diff changeset
353 gint pos = aud_playlist_get_position_nolock(playlist);
901
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
354 gint incr = *(gint *)data;
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
355
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
356 pos = pos + incr;
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
357 if(pos < 0)
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
358 pos = 0;
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
359
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
360 AUDDBG("do_setpos: pos = %d\n\n", pos);
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
361
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
362 if (!playlist)
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
363 return FALSE;
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
364
1274
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
365 /* being done from the main loop thread, does not require locks */
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2050
diff changeset
366 aud_playlist_set_position(playlist, (guint)pos);
1274
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
367
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
368 return FALSE; //one-shot
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
369 }
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
370
559
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
371 static void cue_pause(InputPlayback * data, short p)
251
0469aa4ae1ec [svn] - make pause do something. closes #636
nenolod
parents: 242
diff changeset
372 {
0469aa4ae1ec [svn] - make pause do something. closes #636
nenolod
parents: 242
diff changeset
373 if (real_ip != NULL)
559
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
374 real_ip->plugin->pause(real_ip, p);
251
0469aa4ae1ec [svn] - make pause do something. closes #636
nenolod
parents: 242
diff changeset
375 }
0469aa4ae1ec [svn] - make pause do something. closes #636
nenolod
parents: 242
diff changeset
376
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
377 static void set_info_override(gchar * unused, gint length, gint rate, gint freq, gint nch)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
378 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
379 gchar *title;
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2050
diff changeset
380 Playlist *playlist = aud_playlist_get_active();
363
958855dae693 [svn] - fix other plugins dependant on the playlist framework
nenolod
parents: 357
diff changeset
381
958855dae693 [svn] - fix other plugins dependant on the playlist framework
nenolod
parents: 357
diff changeset
382 g_return_if_fail(playlist != NULL);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
383
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
384 /* annoying. */
363
958855dae693 [svn] - fix other plugins dependant on the playlist framework
nenolod
parents: 357
diff changeset
385 if (playlist->position->tuple == NULL)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
386 {
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2050
diff changeset
387 gint pos = aud_playlist_get_position(playlist);
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2050
diff changeset
388 aud_playlist_get_tuple(playlist, pos);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
389 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
390
363
958855dae693 [svn] - fix other plugins dependant on the playlist framework
nenolod
parents: 357
diff changeset
391 title = g_strdup(playlist->position->title);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
392
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
393 cue_ip.set_info(title, length, rate, freq, nch);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
394 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
395
559
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
396 static void play_cue_uri(InputPlayback * data, gchar *uri)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
397 {
1557
c8c725957643 make cuesheet plugin work again.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1510
diff changeset
398 gchar *path2 = g_strdup(uri + 6); // "cue://" is stripped.
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
399 gchar *_path = strchr(path2, '?');
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
400 gint track = 0;
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
401 ProbeResult *pr;
559
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
402 InputPlugin *real_ip_plugin;
1737
b729c7a72c20 - remove get_song_info interface.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1692
diff changeset
403 Tuple *tuple = NULL;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
404
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
405 AUDDBG("f: play_cue_uri\n");
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
406 AUDDBG("play_cue_uri: playback = %p\n", data);
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
407 AUDDBG("play_cue_uri: path2 = %s\n", path2);
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
408
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
409 /* stop watchdog thread */
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
410 g_mutex_lock(cue_mutex);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
411 watchdog_state = STOP;
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
412 g_mutex_unlock(cue_mutex);
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
413 g_cond_signal(cue_cond);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
414
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
415 if (_path != NULL && *_path == '?')
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
416 {
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
417 *_path = '\0';
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
418 _path++;
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
419 track = atoi(_path);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
420 }
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
421 cur_cue_track = track;
1557
c8c725957643 make cuesheet plugin work again.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1510
diff changeset
422 cache_cue_file(path2); //path2 should be uri.
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
423
1978
fa9f85cebade s/vfs_/aud_vfs_/g
William Pitcock <nenolod@atheme.org>
parents: 1976
diff changeset
424 if (cue_file == NULL || !aud_vfs_file_test(cue_file, G_FILE_TEST_EXISTS))
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
425 return;
241
a1e15310703e [svn] Crash avoidance for zeroed cue sheets. By TiCPU, submitted in #audacious.
chainsaw
parents: 239
diff changeset
426
2073
609169a441a7 update for new API
William Pitcock <nenolod@atheme.org>
parents: 2070
diff changeset
427 pr = aud_input_check_file(cue_file, FALSE);
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
428 if (pr == NULL)
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
429 return;
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
430
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
431 real_ip_plugin = pr->ip;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
432
559
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
433 if (real_ip_plugin != NULL)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
434 {
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
435 if (real_ip)
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
436 g_free(real_ip);
1999
3afd18361a10 change the way of duplicating original playback.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1997
diff changeset
437
3afd18361a10 change the way of duplicating original playback.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1997
diff changeset
438 /* duplicate original playback and modify */
3afd18361a10 change the way of duplicating original playback.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1997
diff changeset
439 real_ip = (InputPlayback *)g_memdup(data, sizeof(InputPlayback));
559
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
440 real_ip->plugin = real_ip_plugin;
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
441 real_ip->plugin->set_info = set_info_override;
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
442 real_ip->plugin->output = cue_ip.output;
d5782f3bd760 [svn] Update plugins to the new input plugin API
iabervon
parents: 532
diff changeset
443 real_ip->filename = cue_file;
602
20b8e735f69e [svn] - adaptation for playback API. make cuesheet plugin pass playback->output to real_ip.
yaz
parents: 559
diff changeset
444
2162
c4b97a9c1f6b remove get_time().
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2147
diff changeset
445 data->playing = 1;
c4b97a9c1f6b remove get_time().
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2147
diff changeset
446
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
447 real_play_thread = g_thread_create((GThreadFunc)(real_ip->plugin->play_file), (gpointer)real_ip, TRUE, NULL);
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
448 g_usleep(50000); // wait for 50msec while real input plugin is initializing.
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
449
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
450 if(real_ip->plugin->mseek) {
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
451 AUDDBG("mseek\n");
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
452 real_ip->plugin->mseek(real_ip, finetune_seek ? finetune_seek : cue_tracks[track].index);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
453 }
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
454 else
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
455 real_ip->plugin->seek(real_ip, finetune_seek ? finetune_seek / 1000 : cue_tracks[track].index / 1000 + 1);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
456
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
457 g_mutex_lock(cue_target_time_mutex);
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
458 target_time = finetune_seek ? finetune_seek : cue_tracks[track].index;
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
459 g_mutex_unlock(cue_target_time_mutex);
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
460
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
461 AUDDBG("cue: play_cue_uri: target_time = %d\n", target_time);
1737
b729c7a72c20 - remove get_song_info interface.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1692
diff changeset
462
b729c7a72c20 - remove get_song_info interface.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1692
diff changeset
463 tuple = real_ip->plugin->get_song_tuple(cue_file);
b729c7a72c20 - remove get_song_info interface.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1692
diff changeset
464 if(tuple) {
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
465 cue_tracks[last_cue_track].index = aud_tuple_get_int(tuple, FIELD_LENGTH, NULL);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1961
diff changeset
466 aud_tuple_free(tuple); tuple = NULL;
1737
b729c7a72c20 - remove get_song_info interface.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1692
diff changeset
467 }
860
cafc7d5769f9 [svn] - support "Repeat".
yaz
parents: 859
diff changeset
468
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
469 /* kick watchdog thread */
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
470 g_mutex_lock(cue_mutex);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
471 watchdog_state = RUN;
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
472 g_mutex_unlock(cue_mutex);
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
473 g_cond_signal(cue_cond);
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
474
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
475 AUDDBG("watchdog activated\n");
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
476
1363
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
477 finetune_seek = 0;
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
478 if(real_play_thread) {
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
479 g_mutex_lock(cue_block_mutex);
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
480 g_cond_wait(cue_block_cond, cue_block_mutex); // block until stop() is called.
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
481 g_mutex_unlock(cue_block_mutex);
da987606127e first attempt to adapt cuesheet to the new threading model.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1274
diff changeset
482 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
483 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
484
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
485 AUDDBG("e: play_cue_uri\n");
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
486 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
487
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
488 /******************************************************* watchdog */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
489
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
490 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
491 * This is fairly hard to explain.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
492 *
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
493 * Basically we loop until we have reached the correct track.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
494 * Then we set a finetune adjustment to make sure we stay in the
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
495 * right place.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
496 *
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
497 * I used to recurse here (it was prettier), but that didn't work
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
498 * as well as I was hoping.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
499 *
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
500 * Anyhow, yeah. The logic here isn't great, but it works, so I'm
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
501 * cool with it.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
502 *
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
503 * - nenolod
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
504 */
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
505 static gpointer watchdog_func(gpointer data)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
506 {
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
507 gint time = 0;
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
508 Playlist *playlist = NULL;
901
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
509 GTimeVal sleep_time;
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
510
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
511 AUDDBG("f: watchdog\n");
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
512
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
513 while(1) {
853
def1af87ae1f [svn] - add 1sec guard time after issue of playlist_prev/next.
yaz
parents: 848
diff changeset
514 #if 0
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
515 AUDDBG("time = %d cur = %d cidx = %d nidx = %d last = %d\n",
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
516 time, cur_cue_track,
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
517 cue_tracks[cur_cue_track].index,
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
518 cue_tracks[cur_cue_track+1].index, last_cue_track);
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
519 #endif
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
520 g_get_current_time(&sleep_time);
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
521 g_time_val_add(&sleep_time, 10000); // interval is 10msec.
308
1bf162c7b4b9 [svn] - cuesheet plugin improvements via hiro @ audacious boards
nenolod
parents: 251
diff changeset
522
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
523 g_mutex_lock(cue_mutex);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
524 switch(watchdog_state) {
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
525 case EXIT:
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
526 AUDDBG("e: watchdog exit\n");
1274
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
527 g_mutex_unlock(cue_mutex); // stop() will lock cue_mutex.
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
528 stop(real_ip); // need not to care about real_ip != NULL here.
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
529 g_thread_exit(NULL);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
530 break;
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
531 case RUN:
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
532 if(!playlist)
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2050
diff changeset
533 playlist = aud_playlist_get_active();
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
534 g_cond_timed_wait(cue_cond, cue_mutex, &sleep_time);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
535 break;
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
536 case STOP:
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
537 AUDDBG("watchdog deactivated\n");
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
538 g_cond_wait(cue_cond, cue_mutex);
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2050
diff changeset
539 playlist = aud_playlist_get_active();
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
540 break;
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
541 }
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
542 g_mutex_unlock(cue_mutex);
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
543
859
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
544 if(watchdog_state != RUN)
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
545 continue;
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
546
2075
William Pitcock <nenolod@atheme.org>
parents: 2073
diff changeset
547 time = audacious_drct_get_output_time();
1365
8702f72b3382 - reduce guard time in initiating play to avoid stuttering start.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1364
diff changeset
548 #if 0
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
549 AUDDBG("time = %d target_time = %d\n", time, target_time);
1365
8702f72b3382 - reduce guard time in initiating play to avoid stuttering start.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1364
diff changeset
550 #endif
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
551 if(time == 0 || time <= target_time)
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
552 continue;
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
553
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
554 // prev track
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
555 if (time < cue_tracks[cur_cue_track].index)
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
556 {
1274
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
557 static gint incr = 0;
901
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
558 gint oldpos = cur_cue_track;
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
559 AUDDBG("i: watchdog prev\n");
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
560 AUDDBG("time = %d cur = %d cidx = %d nidx = %d\n", time, cur_cue_track,
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
561 cue_tracks[cur_cue_track].index,
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
562 cue_tracks[cur_cue_track+1].index);
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
563
859
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
564 while(time < cue_tracks[cur_cue_track].index) {
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
565 cur_cue_track--;
901
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
566 incr = cur_cue_track - oldpos; // relative position
859
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
567 if (time >= cue_tracks[cur_cue_track].index)
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
568 finetune_seek = time;
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
569
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
570 AUDDBG("cue: prev_track: time = %d cue_tracks[cur_cue_track].index = %d\n",
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
571 time, cue_tracks[cur_cue_track].index);
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
572 AUDDBG("cue: prev_track: finetune_seek = %d\n", finetune_seek);
859
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
573 }
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
574
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
575 g_mutex_lock(cue_target_time_mutex);
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
576 target_time = finetune_seek ? finetune_seek : cue_tracks[cur_cue_track].index;
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
577 g_mutex_unlock(cue_target_time_mutex);
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
578 AUDDBG("cue: prev_track: target_time = %d\n", target_time);
1274
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
579 g_idle_add_full(G_PRIORITY_HIGH , do_setpos, &incr, NULL);
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
580 continue;
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
581 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
582
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
583 // next track
861
59a876be8550 [svn] - refine watchdog thread.
yaz
parents: 860
diff changeset
584 if (cur_cue_track + 1 < last_cue_track && time > cue_tracks[cur_cue_track + 1].index)
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
585 {
1274
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
586 static gint incr = 0;
901
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
587 gint oldpos = cur_cue_track;
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
588 AUDDBG("i: watchdog next\n");
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
589 AUDDBG("time = %d cur = %d cidx = %d nidx = %d last = %d lidx = %d\n", time, cur_cue_track,
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
590 cue_tracks[cur_cue_track].index,
859
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
591 cue_tracks[cur_cue_track+1].index,
860
cafc7d5769f9 [svn] - support "Repeat".
yaz
parents: 859
diff changeset
592 last_cue_track, cue_tracks[last_cue_track].index);
859
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
593 while(time > cue_tracks[cur_cue_track + 1].index) {
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
594 cur_cue_track++;
901
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
595 incr = cur_cue_track - oldpos; // relative position
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
596 if (time >= cue_tracks[cur_cue_track].index)
859
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
597 finetune_seek = time;
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
598 AUDDBG("cue: next_track: time = %d cue_tracks[cur_cue_track].index = %d\n",
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
599 time, cue_tracks[cur_cue_track].index);
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
600 AUDDBG("cue: next_track: finetune_seek = %d\n", finetune_seek);
859
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
601 }
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
602
1376
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
603 g_mutex_lock(cue_target_time_mutex);
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
604 target_time = finetune_seek ? finetune_seek : cue_tracks[cur_cue_track].index;
3a2a91d80818 - introduce target_time and simplify the flow of the watchdog thread. TRANSITION_GUARD_TIME is no longer needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1365
diff changeset
605 g_mutex_unlock(cue_target_time_mutex);
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
606 AUDDBG("cue: next_track: target_time = %d\n", target_time);
2061
2f62797aba22 more work here
William Pitcock <nenolod@atheme.org>
parents: 2058
diff changeset
607 if(aud_cfg->stopaftersong) {
1274
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
608 g_idle_add_full(G_PRIORITY_HIGH, do_stop, (void *)real_ip, NULL);
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
609 continue;
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
610 }
853
def1af87ae1f [svn] - add 1sec guard time after issue of playlist_prev/next.
yaz
parents: 848
diff changeset
611 else {
1274
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
612 g_idle_add_full(G_PRIORITY_HIGH , do_setpos, &incr, NULL);
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
613 continue;
853
def1af87ae1f [svn] - add 1sec guard time after issue of playlist_prev/next.
yaz
parents: 848
diff changeset
614 }
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
615 }
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
616
861
59a876be8550 [svn] - refine watchdog thread.
yaz
parents: 860
diff changeset
617 // last track
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
618 if (cur_cue_track + 1 == last_cue_track &&
861
59a876be8550 [svn] - refine watchdog thread.
yaz
parents: 860
diff changeset
619 (cue_tracks[last_cue_track].index - time < 500 ||
59a876be8550 [svn] - refine watchdog thread.
yaz
parents: 860
diff changeset
620 time > cue_tracks[last_cue_track].index) ){ // may not happen. for safety.
859
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
621 if(!real_ip->output->buffer_playing()) {
2057
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2050
diff changeset
622 gint pos = aud_playlist_get_position(playlist);
cf4fa45ffd80 playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents: 2050
diff changeset
623 if (pos + 1 == aud_playlist_get_length(playlist)) {
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
624 AUDDBG("i: watchdog eof reached\n\n");
2061
2f62797aba22 more work here
William Pitcock <nenolod@atheme.org>
parents: 2058
diff changeset
625 if(aud_cfg->repeat) {
1274
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
626 static gint incr = 0;
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
627 incr = -pos;
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
628 g_idle_add_full(G_PRIORITY_HIGH , do_setpos, &incr, NULL);
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
629 continue;
901
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
630 }
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
631 else {
1274
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
632 g_idle_add_full(G_PRIORITY_HIGH, do_stop, (void *)real_ip, NULL);
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
633 continue;
901
08643d5994fe [svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869.
yaz
parents: 861
diff changeset
634 }
860
cafc7d5769f9 [svn] - support "Repeat".
yaz
parents: 859
diff changeset
635 }
cafc7d5769f9 [svn] - support "Repeat".
yaz
parents: 859
diff changeset
636 else {
2061
2f62797aba22 more work here
William Pitcock <nenolod@atheme.org>
parents: 2058
diff changeset
637 if(aud_cfg->stopaftersong) {
1274
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
638 g_idle_add_full(G_PRIORITY_HIGH, do_stop, (void *)real_ip, NULL);
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
639 continue;
987
8f432e790cfb [svn] - add check for cfg.stopaftersong at the end of cue.
yaz
parents: 932
diff changeset
640 }
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
641 AUDDBG("i: watchdog end of cue, advance in playlist\n\n");
1274
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
642 static gint incr = 1;
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
643 g_idle_add_full(G_PRIORITY_HIGH , do_setpos, &incr, NULL);
bcf6dc9564f4 - eliminate gdk_threads_*() based on giacomo's suggestion.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1267
diff changeset
644 continue;
860
cafc7d5769f9 [svn] - support "Repeat".
yaz
parents: 859
diff changeset
645 }
859
301d03667d2f [svn] - make use of playlist_set_position() instead of playlist_prev/next(). now cuesheet directly jumps to the objective track.
yaz
parents: 853
diff changeset
646 }
848
2452835bbfcf [svn] - make "stop after current song" work.
yaz
parents: 809
diff changeset
647 }
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
648 }
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
649 AUDDBG("e: watchdog\n");
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
650 return NULL; // dummy.
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
651 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
652
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
653 /******************************************************** cuefile */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
654
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
655 static void free_cue_info(void)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
656 {
356
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
657 g_free(cue_file); cue_file = NULL;
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
658 g_free(cue_title); cue_title = NULL;
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
659 g_free(cue_performer); cue_performer = NULL;
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
660 g_free(cue_genre); cue_genre = NULL;
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
661 g_free(cue_year); cue_year = NULL;
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
662 g_free(cue_track); cue_track = NULL;
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
663
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
664 for (; last_cue_track > 0; last_cue_track--) {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
665 g_free(cue_tracks[last_cue_track-1].performer);
803
4a2b2677dd9b [svn] - performer and title of each track should be NULL after freed.
yaz
parents: 602
diff changeset
666 cue_tracks[last_cue_track-1].performer = NULL;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
667 g_free(cue_tracks[last_cue_track-1].title);
803
4a2b2677dd9b [svn] - performer and title of each track should be NULL after freed.
yaz
parents: 602
diff changeset
668 cue_tracks[last_cue_track-1].title = NULL;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
669 }
2396
0504110c694b replaced g_print with AUDDBG
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2316
diff changeset
670 AUDDBG("free_cue_info: last_cue_track = %d\n", last_cue_track);
809
29ae10725c4c [svn] - make use of new millisecond seek API.
yaz
parents: 805
diff changeset
671 last_cue_track = 0;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
672 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
673
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
674 static void cache_cue_file(char *f)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
675 {
1978
fa9f85cebade s/vfs_/aud_vfs_/g
William Pitcock <nenolod@atheme.org>
parents: 1976
diff changeset
676 VFSFile *file = aud_vfs_fopen(f, "rb");
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
677 gchar line[MAX_CUE_LINE_LENGTH+1];
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
678
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
679 if(!file)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
680 return;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
681
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
682 while (TRUE) {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
683 gint p;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
684 gint q;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
685
1978
fa9f85cebade s/vfs_/aud_vfs_/g
William Pitcock <nenolod@atheme.org>
parents: 1976
diff changeset
686 if (aud_vfs_fgets(line, MAX_CUE_LINE_LENGTH+1, file) == NULL) {
fa9f85cebade s/vfs_/aud_vfs_/g
William Pitcock <nenolod@atheme.org>
parents: 1976
diff changeset
687 aud_vfs_fclose(file);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
688 return;
860
cafc7d5769f9 [svn] - support "Repeat".
yaz
parents: 859
diff changeset
689 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
690
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
691 for (p = 0; line[p] && isspace((int) line[p]); p++);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
692 if (!line[p])
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
693 continue;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
694 for (q = p; line[q] && !isspace((int) line[q]); q++);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
695 if (!line[q])
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
696 continue;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
697 line[q] = '\0';
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
698 for (q++; line[q] && isspace((int) line[q]); q++);
356
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
699 if (strcasecmp(line+p, "REM") == 0) {
1762
cf97a7767faa now cuesheet can handle INDEX more than 99 minutes.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1737
diff changeset
700 for (p = q; line[p] && !isspace((int) line[p]); p++);
cf97a7767faa now cuesheet can handle INDEX more than 99 minutes.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1737
diff changeset
701 if (!line[p])
356
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
702 continue;
1762
cf97a7767faa now cuesheet can handle INDEX more than 99 minutes.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1737
diff changeset
703 line[p] = '\0';
cf97a7767faa now cuesheet can handle INDEX more than 99 minutes.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1737
diff changeset
704 for (p++; line[p] && isspace((int) line[p]); p++);
356
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
705 if(strcasecmp(line+q, "GENRE") == 0) {
1762
cf97a7767faa now cuesheet can handle INDEX more than 99 minutes.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1737
diff changeset
706 fix_cue_argument(line+p);
356
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
707 if (last_cue_track == 0)
2050
2ffc6a69fcd1 string API calls -> vtable
William Pitcock <nenolod@atheme.org>
parents: 1999
diff changeset
708 cue_genre = aud_str_to_utf8(line + p);
356
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
709 }
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
710 if(strcasecmp(line+q, "DATE") == 0) {
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
711 gchar *tmp;
1762
cf97a7767faa now cuesheet can handle INDEX more than 99 minutes.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1737
diff changeset
712 fix_cue_argument(line+p);
356
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
713 if (last_cue_track == 0) {
1762
cf97a7767faa now cuesheet can handle INDEX more than 99 minutes.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1737
diff changeset
714 tmp = g_strdup(line + p);
356
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
715 if (tmp) {
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
716 cue_year = strtok(tmp, "/"); // XXX: always in the same format?
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
717 }
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
718 }
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
719 }
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
720 }
35b5161ba78d [svn] cuesheet improvement:
yaz
parents: 310
diff changeset
721 else if (strcasecmp(line+p, "PERFORMER") == 0) {
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
722 fix_cue_argument(line+q);
308
1bf162c7b4b9 [svn] - cuesheet plugin improvements via hiro @ audacious boards
nenolod
parents: 251
diff changeset
723
1bf162c7b4b9 [svn] - cuesheet plugin improvements via hiro @ audacious boards
nenolod
parents: 251
diff changeset
724 if (last_cue_track == 0)
2050
2ffc6a69fcd1 string API calls -> vtable
William Pitcock <nenolod@atheme.org>
parents: 1999
diff changeset
725 cue_performer = aud_str_to_utf8(line + q);
308
1bf162c7b4b9 [svn] - cuesheet plugin improvements via hiro @ audacious boards
nenolod
parents: 251
diff changeset
726 else
2050
2ffc6a69fcd1 string API calls -> vtable
William Pitcock <nenolod@atheme.org>
parents: 1999
diff changeset
727 cue_tracks[last_cue_track - 1].performer = aud_str_to_utf8(line + q);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
728 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
729 else if (strcasecmp(line+p, "FILE") == 0) {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
730 gchar *tmp = g_path_get_dirname(f);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
731 fix_cue_argument(line+q);
1762
cf97a7767faa now cuesheet can handle INDEX more than 99 minutes.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1737
diff changeset
732 cue_file = g_strdup_printf("%s/%s", tmp, line+q); //XXX need to check encoding?
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
733 g_free(tmp);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
734 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
735 else if (strcasecmp(line+p, "TITLE") == 0) {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
736 fix_cue_argument(line+q);
308
1bf162c7b4b9 [svn] - cuesheet plugin improvements via hiro @ audacious boards
nenolod
parents: 251
diff changeset
737 if (last_cue_track == 0)
2050
2ffc6a69fcd1 string API calls -> vtable
William Pitcock <nenolod@atheme.org>
parents: 1999
diff changeset
738 cue_title = aud_str_to_utf8(line + q);
308
1bf162c7b4b9 [svn] - cuesheet plugin improvements via hiro @ audacious boards
nenolod
parents: 251
diff changeset
739 else
2050
2ffc6a69fcd1 string API calls -> vtable
William Pitcock <nenolod@atheme.org>
parents: 1999
diff changeset
740 cue_tracks[last_cue_track-1].title = aud_str_to_utf8(line + q);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
741 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
742 else if (strcasecmp(line+p, "TRACK") == 0) {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
743 gint track;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
744
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
745 fix_cue_argument(line+q);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
746 for (p = q; line[p] && isdigit((int) line[p]); p++);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
747 line[p] = '\0';
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
748 for (; line[q] && line[q] == '0'; q++);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
749 if (!line[q])
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
750 continue;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
751 track = atoi(line+q);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
752 if (track >= MAX_CUE_TRACKS)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
753 continue;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
754 last_cue_track = track;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
755 cue_tracks[last_cue_track-1].index = 0;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
756 cue_tracks[last_cue_track-1].performer = NULL;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
757 cue_tracks[last_cue_track-1].title = NULL;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
758 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
759 else if (strcasecmp(line+p, "INDEX") == 0) {
1762
cf97a7767faa now cuesheet can handle INDEX more than 99 minutes.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1737
diff changeset
760 gint min, sec, frac;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
761 for (p = q; line[p] && !isspace((int) line[p]); p++);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
762 if (!line[p])
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
763 continue;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
764 for (p++; line[p] && isspace((int) line[p]); p++);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
765 for (q = p; line[q] && !isspace((int) line[q]); q++);
1762
cf97a7767faa now cuesheet can handle INDEX more than 99 minutes.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1737
diff changeset
766
cf97a7767faa now cuesheet can handle INDEX more than 99 minutes.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1737
diff changeset
767 if(sscanf(line+p, "%d:%d:%d", &min, &sec, &frac) == 3) {
2397
763d8f49612b correct frame time to 1/75sec. pointed out by Piotr Garus. it closes #162.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2396
diff changeset
768 cue_tracks[last_cue_track-1].index = min * 60000 + sec * 1000 + frac * 1000 / 75;
1762
cf97a7767faa now cuesheet can handle INDEX more than 99 minutes.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1737
diff changeset
769 }
cf97a7767faa now cuesheet can handle INDEX more than 99 minutes.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1737
diff changeset
770 }
cf97a7767faa now cuesheet can handle INDEX more than 99 minutes.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1737
diff changeset
771 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
772
1978
fa9f85cebade s/vfs_/aud_vfs_/g
William Pitcock <nenolod@atheme.org>
parents: 1976
diff changeset
773 aud_vfs_fclose(file);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
774 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
775
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
776 static void fix_cue_argument(char *line)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
777 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
778 if (line[0] == '"') {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
779 gchar *l2;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
780 for (l2 = line+1; *l2 && *l2 != '"'; l2++)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
781 *(l2-1) = *l2;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
782 *(l2-1) = *l2;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
783 for (; *line && *line != '"'; line++) {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
784 if (*line == '\\' && *(line+1)) {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
785 for (l2 = line+1; *l2 && *l2 != '"'; l2++)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
786 *(l2-1) = *l2;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
787 *(l2-1) = *l2;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
788 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
789 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
790 *line = '\0';
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
791 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
792 else {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
793 for (; *line && *line != '\r' && *line != '\n'; line++);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
794 *line = '\0';
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
795 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
796 }