annotate src/cdaudio-ng/cdaudio-ng.c @ 2419:944a510f5200

- now cdaudio-ng calculates discid correctly. closes #165 - moved the menuitem to AUDACIOUS_MENU_PLAYLIST_RCLICK. - now cdaudio-ng clears the current playlist before adding.
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Sat, 23 Feb 2008 15:13:52 +0900
parents 0824c92b6132
children 60936e29c803
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1508
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
1 /*
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
2 * Audacious CD Digital Audio plugin
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
3 *
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
4 * Copyright (c) 2007 Calin Crisan <ccrisan@gmail.com>
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
5 *
1508
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
6 * This program is free software; you can redistribute it and/or modify
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
7 * it under the terms of the GNU General Public License as published by
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
8 * the Free Software Foundation; under version 3 of the License.
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
9 *
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
10 * This program is distributed in the hope that it will be useful,
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
13 * GNU General Public License for more details.
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
14 *
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
15 * You should have received a copy of the GNU General Public License
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
16 * along with this program. If not, see <http://www.gnu.org/licenses>.
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
17 */
1490
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
18
2049
9550e809dc12 Added a short TODO comment section.
Matti Hamalainen <ccr@tnsp.org>
parents: 2048
diff changeset
19
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
20 #include "config.h"
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
21
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
22 #include <string.h>
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
23 #include <stdlib.h>
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
24 #include <unistd.h>
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
25 #include <errno.h>
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
26 #include <libgen.h>
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
27 #include <stdarg.h>
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
28
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
29 #include <cdio/cdio.h>
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
30 #include <cdio/cdtext.h>
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
31 #include <cdio/track.h>
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
32 #include <cdio/cdda.h>
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
33 #include <cdio/audio.h>
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
34 #include <cdio/sector.h>
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
35 #include <cdio/cd_types.h>
1282
ced2aa634901 Added cddb support
zither@litestep.network
parents: 1194
diff changeset
36 #include <cddb/cddb.h>
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
37
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
38 #include <glib.h>
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
39
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
40 #include <audacious/plugin.h>
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
41 #include <audacious/i18n.h>
1529
349cae04e455 -continued German translation
mf0102 <0102@gmx.at>
parents: 1510
diff changeset
42 #include <audacious/output.h>
349cae04e455 -continued German translation
mf0102 <0102@gmx.at>
parents: 1510
diff changeset
43 #include <audacious/playlist.h>
349cae04e455 -continued German translation
mf0102 <0102@gmx.at>
parents: 1510
diff changeset
44 #include <audacious/ui_plugin_menu.h>
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
45 #include <audacious/util.h>
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
46
1189
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
47 #include "cdaudio-ng.h"
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
48 #include "configure.h"
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
49
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
50
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
51 cdng_cfg_t cdng_cfg;
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
52 static gint firsttrackno = -1;
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
53 static gint lasttrackno = -1;
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
54 static CdIo_t *pcdio = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
55 static trackinfo_t *trackinfo = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
56 static gboolean is_paused = FALSE;
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
57 static gint playing_track = -1;
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
58 static dae_params_t *pdae_params = NULL;
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
59 static InputPlayback *pglobalinputplayback = NULL;
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
60 static GtkWidget *main_menu_item, *playlist_menu_item;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
61 static GThread *scan_cd_thread = NULL;
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
62
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
63 static void cdaudio_init(void);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
64 static void cdaudio_about(void);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
65 static void cdaudio_configure(void);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
66 static gint cdaudio_is_our_file(gchar *filename);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
67 static void cdaudio_play_file(InputPlayback *pinputplayback);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
68 static void cdaudio_stop(InputPlayback *pinputplayback);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
69 static void cdaudio_pause(InputPlayback *pinputplayback, gshort paused);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
70 static void cdaudio_seek(InputPlayback *pinputplayback, gint time);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
71 static gint cdaudio_get_time(InputPlayback *pinputplayback);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
72 static gint cdaudio_get_volume(gint *l, gint *r);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
73 static gint cdaudio_set_volume(gint l, gint r);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
74 static void cdaudio_cleanup(void);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
75 static void cdaudio_get_song_info(gchar *filename, gchar **title, gint *length);
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
76 static Tuple *cdaudio_get_song_tuple(gchar *filename);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
77
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
78 static void menu_click(void);
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
79 static Tuple *create_tuple_from_trackinfo_and_filename(gchar *filename);
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
80 static void dae_play_loop(dae_params_t *pdae_params);
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
81 static void *scan_cd(void *nothing);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
82 static void scan_cd_threaded();
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
83 static gint calculate_track_length(gint startlsn, gint endlsn);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
84 static gint find_trackno_from_filename(gchar *filename);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
85 static void cleanup_on_error(void);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
86
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
87
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
88 static InputPlugin inputplugin = {
1624
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
89 .description = "CD Audio Plugin NG",
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
90 .init = cdaudio_init,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
91 .about = cdaudio_about,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
92 .configure = cdaudio_configure,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
93 .is_our_file = cdaudio_is_our_file,
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
94 // .scan_cd = cdaudio_scan_cd,
1624
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
95 .play_file = cdaudio_play_file,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
96 .stop = cdaudio_stop,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
97 .pause = cdaudio_pause,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
98 .seek = cdaudio_seek,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
99 .get_time = cdaudio_get_time,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
100 .get_volume = cdaudio_get_volume,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
101 .set_volume = cdaudio_set_volume,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
102 .cleanup = cdaudio_cleanup,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
103 .get_song_info = cdaudio_get_song_info,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
104 .get_song_tuple = cdaudio_get_song_tuple
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
105 };
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
106
1098
334afe46961c [svn] - cdaudio-ng (aka Zither's CD Audio Plugin): convert to plugin API v2
nenolod
parents: 1048
diff changeset
107 InputPlugin *cdaudio_iplist[] = { &inputplugin, NULL };
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
108
1395
761e17b23e0c added Discovery plugin type
Cristi Magherusan <majeru@atheme-project.org>
parents: 1389
diff changeset
109 DECLARE_PLUGIN(cdaudio, NULL, NULL, cdaudio_iplist, NULL, NULL, NULL, NULL, NULL);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
110
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
111
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
112 static void cdaudio_error(const char *fmt, ...)
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
113 {
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
114 va_list ap;
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
115 fprintf(stderr, "cdaudio-ng: ");
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
116 va_start(ap, fmt);
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
117 vfprintf(stderr, fmt, ap);
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
118 va_end(ap);
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
119 }
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
120
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
121
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
122 static void debug(const char *fmt, ...)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
123 {
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
124 if (cdng_cfg.debug) {
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
125 va_list ap;
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
126 fprintf(stderr, "cdaudio-ng: ");
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
127 va_start(ap, fmt);
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
128 vfprintf(stderr, fmt, ap);
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
129 va_end(ap);
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
130 }
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
131 }
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
132
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
133
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
134 static void cdaudio_init()
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
135 {
2037
33d6f1dc7cfb Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1967
diff changeset
136 ConfigDb *db;
33d6f1dc7cfb Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1967
diff changeset
137 gchar *menu_item_text;
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
138
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
139 debug("cdaudio_init()\n");
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
140
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
141 cdng_cfg.use_dae = TRUE;
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
142 cdng_cfg.use_cdtext = TRUE;
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
143 cdng_cfg.use_cddb = TRUE;
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
144 cdng_cfg.debug = FALSE;
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
145 cdng_cfg.device = g_strdup("");
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
146 cdng_cfg.cddb_server = g_strdup(CDDA_DEFAULT_CDDB_SERVER);
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
147 cdng_cfg.cddb_port = CDDA_DEFAULT_CDDB_PORT;
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
148 cdng_cfg.cddb_http = FALSE;
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
149 cdng_cfg.limitspeed = CDDA_DEFAULT_LIMIT_SPEED;
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
150 cdng_cfg.use_proxy = FALSE;
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
151 cdng_cfg.proxy_host = g_strdup("");
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
152 cdng_cfg.proxy_port = CDDA_DEFAULT_PROXY_PORT;
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
153 cdng_cfg.proxy_username = g_strdup("");
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
154 cdng_cfg.proxy_password = g_strdup("");
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
155
2044
ab763bbe6f14 s/bmp_cfg_/aud_cfg_/
Matti Hamalainen <ccr@tnsp.org>
parents: 2043
diff changeset
156 if ((db = aud_cfg_db_open()) == NULL) {
2037
33d6f1dc7cfb Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1967
diff changeset
157 cdaudio_error("Failed to read configuration.\n");
33d6f1dc7cfb Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1967
diff changeset
158 cleanup_on_error();
33d6f1dc7cfb Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1967
diff changeset
159 return;
33d6f1dc7cfb Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1967
diff changeset
160 }
33d6f1dc7cfb Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1967
diff changeset
161
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
162 if (!cdio_init()) {
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
163 cdaudio_error("Failed to initialize cdio subsystem.\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
164 cleanup_on_error();
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
165 aud_cfg_db_close(db);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
166 return;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
167 }
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
168
1282
ced2aa634901 Added cddb support
zither@litestep.network
parents: 1194
diff changeset
169 libcddb_init();
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
170
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
171 aud_cfg_db_get_bool(db, "CDDA", "use_dae", &cdng_cfg.use_dae);
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
172 aud_cfg_db_get_bool(db, "CDDA", "use_cdtext", &cdng_cfg.use_cdtext);
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
173 aud_cfg_db_get_bool(db, "CDDA", "use_cddb", &cdng_cfg.use_cddb);
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
174 aud_cfg_db_get_bool(db, "CDDA", "debug", &cdng_cfg.debug);
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
175 aud_cfg_db_get_string(db, "CDDA", "device", &cdng_cfg.device);
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
176 aud_cfg_db_get_string(db, "CDDA", "cddbserver", &cdng_cfg.cddb_server);
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
177 aud_cfg_db_get_int(db, "CDDA", "cddbport", &cdng_cfg.cddb_port);
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
178 aud_cfg_db_get_bool(db, "CDDA", "cddbhttp", &cdng_cfg.cddb_http);
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
179 aud_cfg_db_get_int(db, "CDDA", "limitspeed", &cdng_cfg.limitspeed);
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
180 aud_cfg_db_get_bool(db, "audacious", "use_proxy", &cdng_cfg.use_proxy);
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
181 aud_cfg_db_get_string(db, "audacious", "proxy_host", &cdng_cfg.proxy_host);
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
182 aud_cfg_db_get_int(db, "audacious", "proxy_port", &cdng_cfg.proxy_port);
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
183 aud_cfg_db_get_string(db, "audacious", "proxy_user", &cdng_cfg.proxy_username);
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
184 aud_cfg_db_get_string(db, "audacious", "proxy_pass", &cdng_cfg.proxy_password);
1189
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
185
2044
ab763bbe6f14 s/bmp_cfg_/aud_cfg_/
Matti Hamalainen <ccr@tnsp.org>
parents: 2043
diff changeset
186 aud_cfg_db_close(db);
1189
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
187
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
188 debug("use_dae = %d, limitspeed = %d, use_cdtext = %d, use_cddb = %d, cddbserver = \"%s\", cddbport = %d, cddbhttp = %d, device = \"%s\", debug = %d\n",
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
189 cdng_cfg.use_dae, cdng_cfg.limitspeed, cdng_cfg.use_cdtext, cdng_cfg.use_cddb,
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
190 cdng_cfg.cddb_server, cdng_cfg.cddb_port, cdng_cfg.cddb_http, cdng_cfg.device, cdng_cfg.debug);
1189
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
191
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
192 configure_create_gui();
1490
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
193
2037
33d6f1dc7cfb Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1967
diff changeset
194 menu_item_text = _("Add CD");
1529
349cae04e455 -continued German translation
mf0102 <0102@gmx.at>
parents: 1510
diff changeset
195 main_menu_item = gtk_image_menu_item_new_with_label(menu_item_text);
1490
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
196 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(main_menu_item), gtk_image_new_from_stock(GTK_STOCK_CDROM, GTK_ICON_SIZE_MENU));
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
197 gtk_widget_show(main_menu_item);
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
198 audacious_menu_plugin_item_add(AUDACIOUS_MENU_MAIN, main_menu_item);
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
199 g_signal_connect(G_OBJECT(main_menu_item), "button_press_event", G_CALLBACK(menu_click), NULL);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
200
1529
349cae04e455 -continued German translation
mf0102 <0102@gmx.at>
parents: 1510
diff changeset
201 playlist_menu_item = gtk_image_menu_item_new_with_label(menu_item_text);
1490
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
202 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(playlist_menu_item), gtk_image_new_from_stock(GTK_STOCK_CDROM, GTK_ICON_SIZE_MENU));
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
203 gtk_widget_show(playlist_menu_item);
2419
944a510f5200 - now cdaudio-ng calculates discid correctly. closes #165
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2384
diff changeset
204 audacious_menu_plugin_item_add(AUDACIOUS_MENU_PLAYLIST_RCLICK, playlist_menu_item);
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
205 g_signal_connect(G_OBJECT(playlist_menu_item), "button_press_event", G_CALLBACK(menu_click), NULL);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
206
1997
9d0f5be50219 uri_ to aud_uri_
William Pitcock <nenolod@atheme.org>
parents: 1984
diff changeset
207 aud_uri_set_plugin("cdda://", &inputplugin);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
208 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
209
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
210 static void cdaudio_about()
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
211 {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
212 debug("cdaudio_about()\n");
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
213
1377
4eb2bacab83a Added an information box to cdaudio-ng
Calin Crisan ccrisan@gmail.com
parents: 1349
diff changeset
214 static GtkWidget* about_window = NULL;
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
215
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
216 if (about_window) {
2192
e5401b6c4665 the same thing in many plugins
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2150
diff changeset
217 gtk_window_present(GTK_WINDOW(about_window));
e5401b6c4665 the same thing in many plugins
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2150
diff changeset
218 } else {
e5401b6c4665 the same thing in many plugins
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2150
diff changeset
219 about_window = audacious_info_dialog(_("About CD Audio Plugin NG"),
e5401b6c4665 the same thing in many plugins
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2150
diff changeset
220 _("Copyright (c) 2007, by Calin Crisan <ccrisan@gmail.com> and The Audacious Team.\n\n"
e5401b6c4665 the same thing in many plugins
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2150
diff changeset
221 "Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
e5401b6c4665 the same thing in many plugins
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2150
diff changeset
222 "\tand to libcddb developers <http://libcddb.sourceforge.net/>.\n\n"
e5401b6c4665 the same thing in many plugins
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2150
diff changeset
223 "Also thank you Tony Vroon for mentoring & guiding me.\n\n"
e5401b6c4665 the same thing in many plugins
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2150
diff changeset
224 "This was a Google Summer of Code 2007 project."), _("OK"), FALSE, NULL, NULL);
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
225
2192
e5401b6c4665 the same thing in many plugins
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2150
diff changeset
226 g_signal_connect(G_OBJECT(about_window), "destroy", G_CALLBACK(gtk_widget_destroyed), &about_window);
e5401b6c4665 the same thing in many plugins
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2150
diff changeset
227 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
228 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
229
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
230 static void cdaudio_configure()
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
231 {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
232 debug("cdaudio_configure()\n");
1189
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
233
1339
83cbc6968a0b Set DAE the default and non-optional play method; Configuring the plugin no longer stops the playback;
Calin Crisan ccrisan@gmail.com
parents: 1314
diff changeset
234 /*
1303
2a7c9e0b9c0f Added configure options for cddb
zither@litestep.network
parents: 1282
diff changeset
235 if (playing_track != -1)
2a7c9e0b9c0f Added configure options for cddb
zither@litestep.network
parents: 1282
diff changeset
236 playback_stop();
1339
83cbc6968a0b Set DAE the default and non-optional play method; Configuring the plugin no longer stops the playback;
Calin Crisan ccrisan@gmail.com
parents: 1314
diff changeset
237 */
1303
2a7c9e0b9c0f Added configure options for cddb
zither@litestep.network
parents: 1282
diff changeset
238
1189
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
239 configure_show_gui();
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
240
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
241 debug("use_dae = %d, limitspeed = %d, use_cdtext = %d, use_cddb = %d, cddbserver = \"%s\", cddbport = %d, cddbhttp = %d, device = \"%s\", debug = %d\n",
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
242 cdng_cfg.use_dae, cdng_cfg.limitspeed, cdng_cfg.use_cdtext, cdng_cfg.use_cddb,
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
243 cdng_cfg.cddb_server, cdng_cfg.cddb_port, cdng_cfg.cddb_http, cdng_cfg.device, cdng_cfg.debug);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
244 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
245
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
246 static gint cdaudio_is_our_file(gchar *filename)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
247 {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
248 debug("cdaudio_is_our_file(\"%s\")\n", filename);
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
249
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
250 if ((filename != NULL) && strlen(filename) > 4 && (!strcasecmp(filename + strlen(filename) - 4, ".cda"))) {
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
251 /* no CD information yet */
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
252 if (pcdio == NULL) {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
253 debug("no CD information, scanning\n");
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
254 scan_cd_threaded(NULL);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
255 }
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
256
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
257 /* reload the cd information if the media has changed */
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
258 if (pcdio != NULL && cdio_get_media_changed(pcdio)) {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
259 debug("CD changed, rescanning\n");
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
260 scan_cd_threaded(NULL);
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
261 }
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
262
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
263 /* check if the requested track actually exists on the current audio cd */
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
264 gint trackno = find_trackno_from_filename(filename);
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
265 if (trackno < firsttrackno || trackno > lasttrackno) {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
266 debug("\"%s\" is not our file\n", filename);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
267 return FALSE;
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
268 }
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
269
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
270 debug("\"%s\" is our file\n", filename);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
271 return TRUE;
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
272 }
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
273 else {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
274 debug("\"%s\" is not our file\n", filename);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
275 return FALSE;
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
276 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
277 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
278
2043
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
279
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
280 static void cdaudio_set_strinfo(trackinfo_t *t,
2043
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
281 const gchar *performer, const gchar *name, const gchar *genre)
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
282 {
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
283 g_strlcpy(t->performer, performer, DEF_STRING_LEN);
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
284 g_strlcpy(t->name, name, DEF_STRING_LEN);
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
285 g_strlcpy(t->genre, genre, DEF_STRING_LEN);
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
286 }
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
287
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
288
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
289 static void cdaudio_set_fullinfo(trackinfo_t *t,
2043
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
290 const lsn_t startlsn, const lsn_t endlsn,
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
291 const gchar *performer, const gchar *name, const gchar *genre)
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
292 {
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
293 t->startlsn = startlsn;
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
294 t->endlsn = endlsn;
2043
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
295 cdaudio_set_strinfo(t, performer, name, genre);
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
296 }
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
297
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
298
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
299 static void cdaudio_play_file(InputPlayback *pinputplayback)
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
300 {
1466
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
301 Tuple *tuple;
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
302 gchar *title;
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
303
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
304 debug("cdaudio_play_file(\"%s\")\n", pinputplayback->filename);
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
305
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
306 pglobalinputplayback = pinputplayback;
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
307
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
308 if (trackinfo == NULL) {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
309 debug("no CD information, scanning\n");
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
310 if (scan_cd_thread != NULL)
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
311 g_thread_join(scan_cd_thread);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
312 else
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
313 scan_cd(pinputplayback);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
314 }
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
315 else
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
316 if (cdio_get_media_changed(pcdio)) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
317 debug("CD changed, rescanning\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
318 if (scan_cd_thread != NULL)
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
319 g_thread_join(scan_cd_thread);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
320 else
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
321 scan_cd(pinputplayback);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
322 }
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
323
1389
e2754a023ae0 Fixed surprise eject segfault
Calin Crisan ccrisan@gmail.com
parents: 1388
diff changeset
324 if (trackinfo == NULL) {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
325 debug("no CD information can be retrieved, aborting\n");
1389
e2754a023ae0 Fixed surprise eject segfault
Calin Crisan ccrisan@gmail.com
parents: 1388
diff changeset
326 pinputplayback->playing = FALSE;
e2754a023ae0 Fixed surprise eject segfault
Calin Crisan ccrisan@gmail.com
parents: 1388
diff changeset
327 return;
e2754a023ae0 Fixed surprise eject segfault
Calin Crisan ccrisan@gmail.com
parents: 1388
diff changeset
328 }
e2754a023ae0 Fixed surprise eject segfault
Calin Crisan ccrisan@gmail.com
parents: 1388
diff changeset
329
2043
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
330 gint trackno = find_trackno_from_filename(pinputplayback->filename);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
331 if (trackno < firsttrackno || trackno > lasttrackno) {
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
332 cdaudio_error("Track #%d is out of range [%d..%d]\n", trackno, firsttrackno, lasttrackno);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
333 cleanup_on_error();
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
334 return;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
335 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
336
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
337 pinputplayback->playing = TRUE;
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
338 playing_track = trackno;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
339 is_paused = FALSE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
340
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
341 tuple = create_tuple_from_trackinfo_and_filename(pinputplayback->filename);
2055
2f2ffbc2d04d gentitle changes
William Pitcock <nenolod@atheme.org>
parents: 2049
diff changeset
342 title = aud_tuple_formatter_make_title_string(tuple, aud_get_gentitle_format());
1387
20c6caad7e03 Fixed the play/stop indication; added a temporary workaround for including the last 3 seconds in playback
Calin Crisan ccrisan@gmail.com
parents: 1382
diff changeset
343
1984
489e32a8e106 change some places to use set_params() instead of set_info() directly
William Pitcock <nenolod@atheme.org>
parents: 1976
diff changeset
344 pinputplayback->set_params(pinputplayback, title, calculate_track_length(trackinfo[trackno].startlsn, trackinfo[trackno].endlsn), 1411200, 44100, 2);
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
345 g_free(title);
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1967
diff changeset
346 aud_tuple_free(tuple);
1387
20c6caad7e03 Fixed the play/stop indication; added a temporary workaround for including the last 3 seconds in playback
Calin Crisan ccrisan@gmail.com
parents: 1382
diff changeset
347
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
348 if (cdng_cfg.use_dae) {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
349 debug("using digital audio extraction\n");
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
350
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
351 if (pdae_params != NULL) {
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
352 cdaudio_error("DAE playback seems to be already started.\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
353 return;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
354 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
355
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
356 if (pinputplayback->output->open_audio(FMT_S16_LE, 44100, 2) == 0) {
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
357 cdaudio_error("Failed to open audio output.\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
358 cleanup_on_error();
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
359 return;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
360 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
361
1349
ab387ad5b88e Converted to new threading model
Calin Crisan ccrisan@gmail.com
parents: 1341
diff changeset
362 /*
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
363 debug("starting dae thread...\n");
1349
ab387ad5b88e Converted to new threading model
Calin Crisan ccrisan@gmail.com
parents: 1341
diff changeset
364 */
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
365 pdae_params = (dae_params_t *) g_new(dae_params_t, 1);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
366 pdae_params->startlsn = trackinfo[trackno].startlsn;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
367 pdae_params->endlsn = trackinfo[trackno].endlsn;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
368 pdae_params->pplayback = pinputplayback;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
369 pdae_params->seektime = -1;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
370 pdae_params->currlsn = trackinfo[trackno].startlsn;
1349
ab387ad5b88e Converted to new threading model
Calin Crisan ccrisan@gmail.com
parents: 1341
diff changeset
371 pdae_params->thread = g_thread_self();
1447
195b5657303e updated input plugins to use set_pb_ready to signal to the core that they're ready for playback
Giacomo Lozito <james@develia.org>
parents: 1395
diff changeset
372 pinputplayback->set_pb_ready(pinputplayback);
1349
ab387ad5b88e Converted to new threading model
Calin Crisan ccrisan@gmail.com
parents: 1341
diff changeset
373 dae_play_loop(pdae_params);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
374 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
375 else {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
376 debug("not using digital audio extraction\n");
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
377
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
378 msf_t startmsf, endmsf;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
379 cdio_lsn_to_msf(trackinfo[trackno].startlsn, &startmsf);
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
380 cdio_lsn_to_msf(trackinfo[trackno].endlsn, &endmsf);
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
381 if (cdio_audio_play_msf(pcdio, &startmsf, &endmsf) != DRIVER_OP_SUCCESS) {
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
382 cdaudio_error("Failed to play analog audio CD.\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
383 cleanup_on_error();
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
384 return;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
385 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
386 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
387 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
388
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
389 static void cdaudio_stop(InputPlayback *pinputplayback)
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
390 {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
391 debug("cdaudio_stop(\"%s\")\n", pinputplayback != NULL ? pinputplayback->filename : "N/A");
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
392
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
393 pglobalinputplayback = NULL;
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
394
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
395 if (playing_track == -1)
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
396 return;
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
397
1303
2a7c9e0b9c0f Added configure options for cddb
zither@litestep.network
parents: 1282
diff changeset
398 if (pinputplayback != NULL)
2a7c9e0b9c0f Added configure options for cddb
zither@litestep.network
parents: 1282
diff changeset
399 pinputplayback->playing = FALSE;
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
400 playing_track = -1;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
401 is_paused = FALSE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
402
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
403 if (cdng_cfg.use_dae) {
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
404 if (pdae_params != NULL) {
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
405 g_thread_join(pdae_params->thread);
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
406 g_free(pdae_params);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
407 pdae_params = NULL;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
408 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
409 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
410 else {
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
411 if (cdio_audio_stop(pcdio) != DRIVER_OP_SUCCESS) {
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
412 cdaudio_error("Failed to stop analog CD.\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
413 return;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
414 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
415 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
416 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
417
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
418 static void cdaudio_pause(InputPlayback *pinputplayback, gshort paused)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
419 {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
420 debug("cdaudio_pause(\"%s\", %d)\n", pinputplayback->filename, paused);
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
421
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
422 if (!is_paused) {
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
423 is_paused = TRUE;
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
424 if (!cdng_cfg.use_dae)
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
425 if (cdio_audio_pause(pcdio) != DRIVER_OP_SUCCESS) {
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
426 cdaudio_error("Failed to pause analog CD!\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
427 cleanup_on_error();
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
428 return;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
429 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
430 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
431 else {
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
432 is_paused = FALSE;
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
433 if (!cdng_cfg.use_dae)
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
434 if (cdio_audio_resume(pcdio) != DRIVER_OP_SUCCESS) {
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
435 cdaudio_error("Failed to resume analog CD!\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
436 cleanup_on_error();
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
437 return;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
438 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
439 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
440 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
441
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
442 static void cdaudio_seek(InputPlayback *pinputplayback, gint time)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
443 {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
444 debug("cdaudio_seek(\"%s\", %d)\n", pinputplayback->filename, time);
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
445
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
446 if (playing_track == -1)
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
447 return;
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
448
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
449 if (cdng_cfg.use_dae) {
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
450 if (pdae_params != NULL) {
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
451 pdae_params->seektime = time * 1000;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
452 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
453 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
454 else {
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
455 gint newstartlsn = trackinfo[playing_track].startlsn + time * 75;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
456 msf_t startmsf, endmsf;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
457 cdio_lsn_to_msf(newstartlsn, &startmsf);
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
458 cdio_lsn_to_msf(trackinfo[playing_track].endlsn, &endmsf);
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
459
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
460 if (cdio_audio_play_msf(pcdio, &startmsf, &endmsf) != DRIVER_OP_SUCCESS) {
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
461 cdaudio_error("Failed to play analog CD\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
462 cleanup_on_error();
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
463 return;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
464 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
465 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
466 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
467
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
468 static gint cdaudio_get_time(InputPlayback *pinputplayback)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
469 {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
470 //debug("cdaudio_get_time(\"%s\")\n", pinputplayback->filename); // annoying!
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
471
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
472 if (playing_track == -1)
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
473 return -1;
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
474
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
475 if (!cdng_cfg.use_dae) {
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
476 cdio_subchannel_t subchannel;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
477 if (cdio_audio_read_subchannel(pcdio, &subchannel) != DRIVER_OP_SUCCESS) {
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
478 cdaudio_error("Failed to read analog CD subchannel.\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
479 cleanup_on_error();
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
480 return 0;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
481 }
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
482 gint currlsn = cdio_msf_to_lsn(&subchannel.abs_addr);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
483
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
484 /* check to see if we have reached the end of the song */
1314
b93270e2b7e4 Continuous playing in DAE mode works again
Calin Crisan ccrisan@gmail.com
parents: 1313
diff changeset
485 if (currlsn == trackinfo[playing_track].endlsn)
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
486 return -1;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
487
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
488 return calculate_track_length(trackinfo[playing_track].startlsn, currlsn);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
489 }
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
490 else {
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
491 if (pdae_params != NULL)
1314
b93270e2b7e4 Continuous playing in DAE mode works again
Calin Crisan ccrisan@gmail.com
parents: 1313
diff changeset
492 if (pdae_params->pplayback->playing)
b93270e2b7e4 Continuous playing in DAE mode works again
Calin Crisan ccrisan@gmail.com
parents: 1313
diff changeset
493 return pinputplayback->output->output_time();
b93270e2b7e4 Continuous playing in DAE mode works again
Calin Crisan ccrisan@gmail.com
parents: 1313
diff changeset
494 else
b93270e2b7e4 Continuous playing in DAE mode works again
Calin Crisan ccrisan@gmail.com
parents: 1313
diff changeset
495 return -1;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
496 else
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
497 return -1;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
498 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
499 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
500
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
501 static gint cdaudio_get_volume(gint *l, gint *r)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
502 {
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
503 //printf("cdaudio-ng: cdaudio_get_volume()\n"); // annoying!
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
504
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
505 if (cdng_cfg.use_dae) {
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
506 *l = *r = 0;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
507 return FALSE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
508 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
509 else {
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
510 cdio_audio_volume_t volume;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
511 if (cdio_audio_get_volume(pcdio, &volume) != DRIVER_OP_SUCCESS) {
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
512 cdaudio_error("Failed to retrieve analog CD volume.\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
513 cleanup_on_error();
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
514 *l = *r = 0;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
515 return FALSE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
516 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
517 *l = volume.level[0];
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
518 *r = volume.level[1];
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
519
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
520 return TRUE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
521 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
522 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
523
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
524 static gint cdaudio_set_volume(gint l, gint r)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
525 {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
526 debug("cdaudio_set_volume(%d, %d)\n", l, r);
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
527
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
528 if (cdng_cfg.use_dae) {
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
529 return FALSE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
530 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
531 else {
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
532 cdio_audio_volume_t volume = {{l, r, 0, 0}};
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
533 if (cdio_audio_set_volume(pcdio, &volume) != DRIVER_OP_SUCCESS) {
2150
04421592e6a3 Fixed an unexpected cddb error messaje when no cddb info is available
Calin Crisan ccrisan@gmail.com
parents: 2057
diff changeset
534 cdaudio_error("cdaudio-ng: failed to set analog cd volume\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
535 cleanup_on_error();
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
536 return FALSE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
537 }
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
538
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
539 return TRUE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
540 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
541 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
542
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
543 static void cdaudio_cleanup(void)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
544 {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
545 debug("cdaudio_cleanup()\n");
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
546
1282
ced2aa634901 Added cddb support
zither@litestep.network
parents: 1194
diff changeset
547 libcddb_shutdown();
ced2aa634901 Added cddb support
zither@litestep.network
parents: 1194
diff changeset
548
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
549 if (pcdio != NULL) {
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
550 if (playing_track != -1 && !cdng_cfg.use_dae)
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
551 cdio_audio_stop(pcdio);
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
552 cdio_destroy(pcdio);
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
553 pcdio = NULL;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
554 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
555 if (trackinfo != NULL) {
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
556 g_free(trackinfo);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
557 trackinfo = NULL;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
558 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
559 playing_track = -1;
1282
ced2aa634901 Added cddb support
zither@litestep.network
parents: 1194
diff changeset
560
1189
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
561 // todo: destroy the gui
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
562
2044
ab763bbe6f14 s/bmp_cfg_/aud_cfg_/
Matti Hamalainen <ccr@tnsp.org>
parents: 2043
diff changeset
563 ConfigDb *db = aud_cfg_db_open();
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
564 aud_cfg_db_set_bool(db, "CDDA", "use_dae", cdng_cfg.use_dae);
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
565 aud_cfg_db_set_int(db, "CDDA", "limitspeed", cdng_cfg.limitspeed);
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
566 aud_cfg_db_set_bool(db, "CDDA", "use_cdtext", cdng_cfg.use_cdtext);
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
567 aud_cfg_db_set_bool(db, "CDDA", "use_cddb", cdng_cfg.use_cddb);
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
568 aud_cfg_db_set_string(db, "CDDA", "cddbserver", cdng_cfg.cddb_server);
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
569 aud_cfg_db_set_int(db, "CDDA", "cddbport", cdng_cfg.cddb_port);
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
570 aud_cfg_db_set_bool(db, "CDDA", "cddbhttp", cdng_cfg.cddb_http);
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
571 aud_cfg_db_set_string(db, "CDDA", "device", cdng_cfg.device);
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
572 aud_cfg_db_set_bool(db, "CDDA", "debug", cdng_cfg.debug);
2044
ab763bbe6f14 s/bmp_cfg_/aud_cfg_/
Matti Hamalainen <ccr@tnsp.org>
parents: 2043
diff changeset
573 aud_cfg_db_close(db);
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
574
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
575 audacious_menu_plugin_item_remove(AUDACIOUS_MENU_MAIN, main_menu_item);
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
576 audacious_menu_plugin_item_remove(AUDACIOUS_MENU_PLAYLIST, playlist_menu_item);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
577 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
578
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
579 static void cdaudio_get_song_info(gchar *filename, gchar **title, gint *length)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
580 {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
581 debug("cdaudio_get_song_info(\"%s\")\n", filename);
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
582
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
583 Tuple *tuple = create_tuple_from_trackinfo_and_filename(filename);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
584 int trackno = find_trackno_from_filename(filename);
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
585
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
586 if (tuple) {
2055
2f2ffbc2d04d gentitle changes
William Pitcock <nenolod@atheme.org>
parents: 2049
diff changeset
587 *title = aud_tuple_formatter_process_string(tuple, aud_get_gentitle_format());
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1967
diff changeset
588 aud_tuple_free(tuple);
1466
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
589 tuple = NULL;
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
590 }
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
591 *length = calculate_track_length(trackinfo[trackno].startlsn, trackinfo[trackno].endlsn);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
592 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
593
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
594 static Tuple *cdaudio_get_song_tuple(gchar *filename)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
595 {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
596 debug("cdaudio_get_song_tuple(\"%s\")\n", filename);
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
597
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
598 return create_tuple_from_trackinfo_and_filename(filename);
1341
4ca99d2be90e Titles are now built using tuples, with the preferred format
Calin Crisan ccrisan@gmail.com
parents: 1340
diff changeset
599 }
4ca99d2be90e Titles are now built using tuples, with the preferred format
Calin Crisan ccrisan@gmail.com
parents: 1340
diff changeset
600
4ca99d2be90e Titles are now built using tuples, with the preferred format
Calin Crisan ccrisan@gmail.com
parents: 1340
diff changeset
601
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
602 /*
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
603 * auxiliar functions
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
604 */
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
605 static void menu_click()
1490
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
606 {
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
607 gchar filename[DEF_STRING_LEN];
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
608 gboolean available = TRUE;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
609
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
610 /* reload the cd information if the media has changed, or no track information is available */
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
611 if (pcdio == NULL || cdio_get_media_changed(pcdio)) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
612 debug("CD changed, rescanning\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
613
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
614 available = FALSE;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
615 if (scan_cd_thread != NULL)
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
616 return;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
617 else
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
618 available = (scan_cd(NULL) != NULL);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
619 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
620
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
621 if (!available) {
1490
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
622 const gchar *markup =
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
623 N_("<b><big>No playable CD found.</big></b>\n\n"
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
624 "No CD inserted, or inserted CD is not an audio CD.\n");
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
625
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
626 GtkWidget *dialog =
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
627 gtk_message_dialog_new_with_markup(NULL,
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
628 GTK_DIALOG_DESTROY_WITH_PARENT,
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
629 GTK_MESSAGE_ERROR,
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
630 GTK_BUTTONS_OK,
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
631 _(markup));
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
632 gtk_dialog_run(GTK_DIALOG(dialog));
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
633 gtk_widget_destroy(dialog);
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
634 return;
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
635 }
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
diff changeset
636
2419
944a510f5200 - now cdaudio-ng calculates discid correctly. closes #165
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2384
diff changeset
637 aud_playlist_clear(aud_playlist_get_active());
944a510f5200 - now cdaudio-ng calculates discid correctly. closes #165
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2384
diff changeset
638
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
639 int trackno;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
640 for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
641 g_snprintf(filename, DEF_STRING_LEN, "track%02u.cda", trackno);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
642 gchar *pathname = g_build_filename(CDDA_DEFAULT, filename, NULL);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
643 aud_playlist_add(aud_playlist_get_active(), pathname);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
644 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
645 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
646
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
647 static Tuple *create_tuple_from_trackinfo_and_filename(gchar *filename)
1341
4ca99d2be90e Titles are now built using tuples, with the preferred format
Calin Crisan ccrisan@gmail.com
parents: 1340
diff changeset
648 {
2043
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
649 Tuple *tuple = aud_tuple_new_from_filename(filename);
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
650
1389
e2754a023ae0 Fixed surprise eject segfault
Calin Crisan ccrisan@gmail.com
parents: 1388
diff changeset
651 if (trackinfo == NULL)
2043
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
652 return tuple;
1389
e2754a023ae0 Fixed surprise eject segfault
Calin Crisan ccrisan@gmail.com
parents: 1388
diff changeset
653
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
654 gint trackno = find_trackno_from_filename(filename);
1341
4ca99d2be90e Titles are now built using tuples, with the preferred format
Calin Crisan ccrisan@gmail.com
parents: 1340
diff changeset
655
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
656 if (trackno < firsttrackno || trackno > lasttrackno)
2043
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
657 return tuple;
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
658
1466
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
659 if(strlen(trackinfo[trackno].performer)) {
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1967
diff changeset
660 aud_tuple_associate_string(tuple, FIELD_ARTIST, NULL, trackinfo[trackno].performer);
1466
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
661 }
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
662 if(strlen(trackinfo[0].name)) {
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1967
diff changeset
663 aud_tuple_associate_string(tuple, FIELD_ALBUM, NULL, trackinfo[0].name);
1466
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
664 }
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
665 if(strlen(trackinfo[trackno].name)) {
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1967
diff changeset
666 aud_tuple_associate_string(tuple, FIELD_TITLE, NULL, trackinfo[trackno].name);
1466
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
667 }
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
668
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1967
diff changeset
669 aud_tuple_associate_int(tuple, FIELD_TRACK_NUMBER, NULL, trackno);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1967
diff changeset
670 aud_tuple_associate_string(tuple, -1, "ext", "cda"); //XXX should do? --yaz
1466
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
671
2043
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
672 aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL,
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
673 calculate_track_length(trackinfo[trackno].startlsn, trackinfo[trackno].endlsn));
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
674
1466
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
675 if(strlen(trackinfo[trackno].genre)) {
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1967
diff changeset
676 aud_tuple_associate_string(tuple, FIELD_GENRE, NULL, trackinfo[trackno].genre);
1466
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
677 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
678 //tuple->year = 0; todo: set the year
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
679
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
680 return tuple;
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
681 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
682
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
683 static void dae_play_loop(dae_params_t *pdae_params)
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
684 {
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
685 guchar *buffer = g_new(guchar, CDDA_DAE_FRAMES * CDIO_CD_FRAMESIZE_RAW);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
686
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
687 debug("dae started\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
688 cdio_lseek(pcdio, pdae_params->startlsn * CDIO_CD_FRAMESIZE_RAW, SEEK_SET);
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
689
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
690 gboolean output_paused = FALSE;
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
691 gint read_error_counter = 0;
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
692
1387
20c6caad7e03 Fixed the play/stop indication; added a temporary workaround for including the last 3 seconds in playback
Calin Crisan ccrisan@gmail.com
parents: 1382
diff changeset
693 //pdae_params->endlsn += 75 * 3;
20c6caad7e03 Fixed the play/stop indication; added a temporary workaround for including the last 3 seconds in playback
Calin Crisan ccrisan@gmail.com
parents: 1382
diff changeset
694
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
695 while (pdae_params->pplayback->playing) {
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
696 /* handle pause status */
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
697 if (is_paused) {
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
698 if (!output_paused) {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
699 debug("playback was not paused, pausing\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
700 pdae_params->pplayback->output->pause(TRUE);
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
701 output_paused = TRUE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
702 }
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
703 g_usleep(1000);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
704 continue;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
705 }
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
706 else {
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
707 if (output_paused) {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
708 debug("playback was paused, resuming\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
709 pdae_params->pplayback->output->pause(FALSE);
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
710 output_paused = FALSE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
711 }
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
712 }
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
713
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
714 /* check if we have to seek */
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
715 if (pdae_params->seektime != -1) {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
716 debug("requested seek to %d ms\n", pdae_params->seektime);
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
717 gint newlsn = pdae_params->startlsn + ((pdae_params->seektime * 75) / 1000);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
718 cdio_lseek(pcdio, newlsn * CDIO_CD_FRAMESIZE_RAW, SEEK_SET);
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
719 pdae_params->pplayback->output->flush(pdae_params->seektime);
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
720 pdae_params->currlsn = newlsn;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
721 pdae_params->seektime = -1;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
722 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
723
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
724 /* compute the actual number of sectors to read */
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
725 gint lsncount = CDDA_DAE_FRAMES <= (pdae_params->endlsn - pdae_params->currlsn + 1) ? CDDA_DAE_FRAMES : (pdae_params->endlsn - pdae_params->currlsn + 1);
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
726
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
727 /* check too see if we have reached the end of the song */
1387
20c6caad7e03 Fixed the play/stop indication; added a temporary workaround for including the last 3 seconds in playback
Calin Crisan ccrisan@gmail.com
parents: 1382
diff changeset
728 if (lsncount <= 0) {
20c6caad7e03 Fixed the play/stop indication; added a temporary workaround for including the last 3 seconds in playback
Calin Crisan ccrisan@gmail.com
parents: 1382
diff changeset
729 sleep(3);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
730 break;
1387
20c6caad7e03 Fixed the play/stop indication; added a temporary workaround for including the last 3 seconds in playback
Calin Crisan ccrisan@gmail.com
parents: 1382
diff changeset
731 }
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
732
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
733 if (cdio_read_audio_sectors(pcdio, buffer, pdae_params->currlsn, lsncount) != DRIVER_OP_SUCCESS) {
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
734 debug("failed to read audio sector\n");
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
735 read_error_counter++;
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
736 if (read_error_counter >= 2) {
1387
20c6caad7e03 Fixed the play/stop indication; added a temporary workaround for including the last 3 seconds in playback
Calin Crisan ccrisan@gmail.com
parents: 1382
diff changeset
737 read_error_counter = 0;
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
738 cdaudio_error("This CD can no longer be played, stopping.\n");
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
739 break;
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
740 }
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
741 }
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
742 else
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
743 read_error_counter = 0;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
744
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
745 gint remainingbytes = lsncount * CDIO_CD_FRAMESIZE_RAW;
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
746 guchar *bytebuff = buffer;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
747 while (pdae_params->pplayback->playing && remainingbytes > 0 && pdae_params->seektime == -1) {
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
748 /* compute the actual number of bytes to play */
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
749 gint bytecount = CDIO_CD_FRAMESIZE_RAW <= remainingbytes ? CDIO_CD_FRAMESIZE_RAW : remainingbytes;
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
750
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
751 /* wait until the output buffer has enough room */
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
752 while (pdae_params->pplayback->playing && pdae_params->pplayback->output->buffer_free() < bytecount && pdae_params->seektime == -1)
2041
ac3207cb728a Use g_usleep()
Matti Hamalainen <ccr@tnsp.org>
parents: 2040
diff changeset
753 g_usleep(1000);
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
754
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
755 /* play the sound :) */
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
756 if (pdae_params->pplayback->playing && pdae_params->seektime == -1)
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
757 pdae_params->pplayback->pass_audio(pdae_params->pplayback, FMT_S16_LE, 2,
1998
8f3188746b64 chase last changeset in aud
William Pitcock <nenolod@atheme.org>
parents: 1997
diff changeset
758 bytecount, bytebuff, &pdae_params->pplayback->playing);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
759 remainingbytes -= bytecount;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
760 bytebuff += bytecount;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
761 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
762 pdae_params->currlsn += lsncount;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
763 }
2256
dc92a550179e cddb may use http instead of cddbp now; the global proxy settings are used if enabled
Calin Crisan ccrisan@gmail.com
parents: 2192
diff changeset
764 debug("dae ended\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
765
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
766 pdae_params->pplayback->playing = FALSE;
1314
b93270e2b7e4 Continuous playing in DAE mode works again
Calin Crisan ccrisan@gmail.com
parents: 1313
diff changeset
767 pdae_params->pplayback->output->close_audio();
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
768 is_paused = FALSE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
769
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
770 pdae_params->pplayback->output->close_audio();
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
771 g_free(buffer);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
772 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
773
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
774 static void scan_cd_threaded()
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
775 {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
776 if (scan_cd_thread != NULL) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
777 debug("A scan_cd thread is already running.\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
778 return;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
779 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
780
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
781 scan_cd_thread = g_thread_create((GThreadFunc)scan_cd, NULL, TRUE, NULL);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
782 if (scan_cd_thread == NULL) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
783 cdaudio_error("Failed to create the thread for retrieving song information.\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
784 return;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
785 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
786 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
787
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
788
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
789 static void *scan_cd(void *nothing)
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
790 {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
791 debug("scan_cd started\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
792
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
793 gint trackno;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
794
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
795 /* find an available, audio capable, cd drive */
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
796 if (cdng_cfg.device != NULL && strlen(cdng_cfg.device) > 0) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
797 pcdio = cdio_open(cdng_cfg.device, DRIVER_UNKNOWN);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
798 if (pcdio == NULL) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
799 cdaudio_error("Failed to open CD device \"%s\".\n", cdng_cfg.device);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
800 scan_cd_thread = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
801 return NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
802 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
803 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
804 else {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
805 gchar **ppcd_drives = cdio_get_devices_with_cap(NULL, CDIO_FS_AUDIO, false);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
806 pcdio = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
807 if (ppcd_drives != NULL && *ppcd_drives != NULL) { /* we have at least one audio capable cd drive */
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
808 pcdio = cdio_open(*ppcd_drives, DRIVER_UNKNOWN);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
809 if (pcdio == NULL) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
810 cdaudio_error("Failed to open CD.\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
811 cleanup_on_error();
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
812 scan_cd_thread = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
813 return NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
814 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
815 debug("found cd drive \"%s\" with audio capable media\n", *ppcd_drives);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
816 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
817 else {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
818 cdaudio_error("Unable to find or access a CDDA capable drive.\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
819 cleanup_on_error();
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
820 scan_cd_thread = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
821 return NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
822 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
823 if (ppcd_drives != NULL && *ppcd_drives != NULL)
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
824 cdio_free_device_list(ppcd_drives);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
825 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
826
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
827 /* limit read speed */
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
828 if (cdng_cfg.limitspeed > 0 && cdng_cfg.use_dae) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
829 debug("setting drive speed limit to %dx\n", cdng_cfg.limitspeed);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
830 if (cdio_set_speed(pcdio, cdng_cfg.limitspeed) != DRIVER_OP_SUCCESS)
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
831 cdaudio_error("Failed to set drive speed to %dx.\n", cdng_cfg.limitspeed);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
832 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
833
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
834 /* general track initialization */
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
835 cdrom_drive_t *pcdrom_drive = cdio_cddap_identify_cdio(pcdio, 1, NULL); // todo : check return / NULL
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
836 firsttrackno = cdio_get_first_track_num(pcdrom_drive->p_cdio);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
837 lasttrackno = cdio_get_last_track_num(pcdrom_drive->p_cdio);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
838 if (firsttrackno == CDIO_INVALID_TRACK || lasttrackno == CDIO_INVALID_TRACK) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
839 cdaudio_error("Failed to retrieve first/last track number.\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
840 cleanup_on_error();
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
841 scan_cd_thread = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
842 return NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
843 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
844 debug("first track is %d and last track is %d\n", firsttrackno, lasttrackno);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
845
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
846 g_free(trackinfo);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
847 trackinfo = (trackinfo_t *) g_new(trackinfo_t, (lasttrackno + 1));
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
848
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
849 cdaudio_set_fullinfo(&trackinfo[0],
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
850 cdio_get_track_lsn(pcdrom_drive->p_cdio, 0),
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
851 cdio_get_track_last_lsn(pcdrom_drive->p_cdio, CDIO_CDROM_LEADOUT_TRACK),
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
852 "", "", "");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
853
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
854 for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
855 cdaudio_set_fullinfo(&trackinfo[trackno],
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
856 cdio_get_track_lsn(pcdrom_drive->p_cdio, trackno),
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
857 cdio_get_track_last_lsn(pcdrom_drive->p_cdio, trackno),
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
858 "", "", "");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
859
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
860 if (trackinfo[trackno].startlsn == CDIO_INVALID_LSN || trackinfo[trackno].endlsn == CDIO_INVALID_LSN) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
861 cdaudio_error("Failed to retrieve stard/end lsn for track %d.\n", trackno);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
862 cleanup_on_error();
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
863 scan_cd_thread = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
864 return NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
865 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
866 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
867
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
868 /* get trackinfo[0] cdtext information (the disc) */
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
869 if (cdng_cfg.use_cdtext) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
870 debug("getting cd-text information for disc\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
871 cdtext_t *pcdtext = cdio_get_cdtext(pcdrom_drive->p_cdio, 0);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
872 if (pcdtext == NULL || pcdtext->field[CDTEXT_TITLE] == NULL) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
873 debug("no cd-text available for disc\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
874 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
875 else {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
876 cdaudio_set_strinfo(&trackinfo[0],
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
877 pcdtext->field[CDTEXT_PERFORMER] ? pcdtext->field[CDTEXT_PERFORMER] : "",
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
878 pcdtext->field[CDTEXT_TITLE] ? pcdtext->field[CDTEXT_TITLE] : "",
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
879 pcdtext->field[CDTEXT_GENRE] ? pcdtext->field[CDTEXT_GENRE] : "");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
880 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
881 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
882
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
883 /* get track information from cdtext */
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
884 gboolean cdtext_was_available = FALSE;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
885 for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
886 cdtext_t *pcdtext = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
887 if (cdng_cfg.use_cdtext) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
888 debug("getting cd-text information for track %d\n", trackno);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
889 pcdtext = cdio_get_cdtext(pcdrom_drive->p_cdio, trackno);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
890 if (pcdtext == NULL || pcdtext->field[CDTEXT_PERFORMER] == NULL) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
891 debug("no cd-text available for track %d\n", trackno);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
892 pcdtext = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
893 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
894 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
895
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
896 if (pcdtext != NULL) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
897 cdaudio_set_strinfo(&trackinfo[trackno],
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
898 pcdtext->field[CDTEXT_PERFORMER] ? pcdtext->field[CDTEXT_PERFORMER] : "",
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
899 pcdtext->field[CDTEXT_TITLE] ? pcdtext->field[CDTEXT_TITLE] : "",
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
900 pcdtext->field[CDTEXT_GENRE] ? pcdtext->field[CDTEXT_GENRE] : "");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
901 cdtext_was_available = TRUE;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
902 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
903 else {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
904 cdaudio_set_strinfo(&trackinfo[trackno], "", "", "");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
905 g_snprintf(trackinfo[trackno].name, DEF_STRING_LEN, "CD Audio Track %02u", trackno);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
906 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
907 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
908
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
909 if (!cdtext_was_available) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
910 /* initialize de cddb subsystem */
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
911 cddb_conn_t *pcddb_conn = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
912 cddb_disc_t *pcddb_disc = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
913 cddb_track_t *pcddb_track = NULL;
2419
944a510f5200 - now cdaudio-ng calculates discid correctly. closes #165
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2384
diff changeset
914 lba_t lba; /* Logical Block Address */
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
915
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
916 if (cdng_cfg.use_cddb) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
917 pcddb_conn = cddb_new();
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
918 if (pcddb_conn == NULL)
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
919 cdaudio_error("Failed to create the cddb connection.\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
920 else {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
921 debug("getting CDDB info\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
922
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
923 cddb_cache_enable(pcddb_conn);
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
924 //cddb_cache_set_dir(pcddb_conn, "~/.cddbslave");
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
925
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
926 if (cdng_cfg.use_proxy) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
927 cddb_http_proxy_enable(pcddb_conn);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
928 cddb_set_http_proxy_server_name(pcddb_conn, cdng_cfg.proxy_host);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
929 cddb_set_http_proxy_server_port(pcddb_conn, cdng_cfg.proxy_port);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
930 cddb_set_http_proxy_username(pcddb_conn, cdng_cfg.proxy_username);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
931 cddb_set_http_proxy_password(pcddb_conn, cdng_cfg.proxy_password);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
932 cddb_set_server_name(pcddb_conn, cdng_cfg.cddb_server);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
933 cddb_set_server_port(pcddb_conn, cdng_cfg.cddb_port);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
934 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
935 else
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
936 if (cdng_cfg.cddb_http) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
937 cddb_http_enable(pcddb_conn);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
938 cddb_set_server_name(pcddb_conn, cdng_cfg.cddb_server);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
939 cddb_set_server_port(pcddb_conn, cdng_cfg.cddb_port);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
940 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
941 else {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
942 cddb_set_server_name(pcddb_conn, cdng_cfg.cddb_server);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
943 cddb_set_server_port(pcddb_conn, cdng_cfg.cddb_port);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
944 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
945
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
946 pcddb_disc = cddb_disc_new();
2419
944a510f5200 - now cdaudio-ng calculates discid correctly. closes #165
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2384
diff changeset
947
944a510f5200 - now cdaudio-ng calculates discid correctly. closes #165
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2384
diff changeset
948 lba = cdio_get_track_lba(pcdio, CDIO_CDROM_LEADOUT_TRACK);
944a510f5200 - now cdaudio-ng calculates discid correctly. closes #165
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2384
diff changeset
949 cddb_disc_set_length(pcddb_disc, FRAMES_TO_SECONDS(lba));
944a510f5200 - now cdaudio-ng calculates discid correctly. closes #165
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2384
diff changeset
950
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
951 for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
952 pcddb_track = cddb_track_new();
2419
944a510f5200 - now cdaudio-ng calculates discid correctly. closes #165
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2384
diff changeset
953 cddb_track_set_frame_offset(pcddb_track, cdio_get_track_lba(pcdio, trackno));
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
954 cddb_disc_add_track(pcddb_disc, pcddb_track);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
955 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
956
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
957 cddb_disc_calc_discid(pcddb_disc);
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
958 unsigned int discid = cddb_disc_get_discid(pcddb_disc);
2326
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
959 debug("CDDB disc id = %x\n", discid);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
960
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
961 gint matches;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
962 if ((matches = cddb_query(pcddb_conn, pcddb_disc)) == -1) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
963 if (cddb_errno(pcddb_conn) == CDDB_ERR_OK)
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
964 cdaudio_error("Failed to query the CDDB server\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
965 else
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
966 cdaudio_error("Failed to query the CDDB server: %s\n", cddb_error_str(cddb_errno(pcddb_conn)));
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
967
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
968 cddb_disc_destroy(pcddb_disc);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
969 pcddb_disc = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
970 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
971 else {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
972 if (matches == 0) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
973 debug("no cddb info available for this disc\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
974
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
975 cddb_disc_destroy(pcddb_disc);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
976 pcddb_disc = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
977 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
978 else {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
979 debug("CDDB disc category = \"%s\"\n", cddb_disc_get_category_str(pcddb_disc));
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
980
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
981 cddb_read(pcddb_conn, pcddb_disc);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
982 if (cddb_errno(pcddb_conn) != CDDB_ERR_OK) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
983 cdaudio_error("failed to read the cddb info: %s\n", cddb_error_str(cddb_errno(pcddb_conn)));
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
984 cddb_disc_destroy(pcddb_disc);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
985 pcddb_disc = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
986 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
987 else {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
988 debug("we have got the cddb info\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
989 cdaudio_set_strinfo(&trackinfo[0],
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
990 cddb_disc_get_artist(pcddb_disc),
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
991 cddb_disc_get_title(pcddb_disc),
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
992 cddb_disc_get_genre(pcddb_disc));
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
993
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
994 int trackno;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
995 for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
996 cddb_track_t *pcddb_track = cddb_disc_get_track(pcddb_disc, trackno - 1);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
997 cdaudio_set_strinfo(&trackinfo[trackno],
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
998 cddb_track_get_artist(pcddb_track),
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
999 cddb_track_get_title(pcddb_track),
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1000 cddb_disc_get_genre(pcddb_disc));
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1001 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1002 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1003 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1004 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1005 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1006 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1007
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1008 if (pcddb_disc != NULL)
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1009 cddb_disc_destroy(pcddb_disc);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1010
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1011 if (pcddb_conn != NULL)
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1012 cddb_destroy(pcddb_conn);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1013 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1014
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1015 if (cdng_cfg.debug) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1016 debug("disc has : performer = \"%s\", name = \"%s\", genre = \"%s\"\n",
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1017 trackinfo[0].performer, trackinfo[0].name, trackinfo[0].genre);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1018
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1019 for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1020 debug("track %d has : performer = \"%s\", name = \"%s\", genre = \"%s\", startlsn = %d, endlsn = %d\n",
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1021 trackno, trackinfo[trackno].performer, trackinfo[trackno].name, trackinfo[trackno].genre, trackinfo[trackno].startlsn, trackinfo[trackno].endlsn);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1022 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1023 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1024
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1025 /*
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1026 if (pinputplayback != NULL) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1027 for (trackno = firsttrackno; trackno <= lasttrackno; trackno++) {
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1028 Tuple *tuple = create_tuple_from_trackinfo(trackno);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1029 gchar *title = aud_tuple_formatter_make_title_string(tuple, aud_get_gentitle_format());
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1030
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1031 pinputplayback->set_params(pinputplayback, title, calculate_track_length(trackinfo[trackno].startlsn, trackinfo[trackno].endlsn), 1411200, 44100, 2);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1032 g_free(title);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1033 aud_tuple_free(tuple);
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1034 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1035 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1036 */
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1037
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1038 debug("scan_cd ended\n");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1039
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1040 scan_cd_thread = NULL;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1041 return (void* ) -1;
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1042 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1043
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
1044 static gint calculate_track_length(gint startlsn, gint endlsn)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1045 {
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1046 return ((endlsn - startlsn + 1) * 1000) / 75;
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1047 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1048
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
1049 static gint find_trackno_from_filename(gchar *filename)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1050 {
2040
997c71881e5b No need for that long buffer.
Matti Hamalainen <ccr@tnsp.org>
parents: 2038
diff changeset
1051 gchar tracknostr[3];
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1052 if ((filename == NULL) || strlen(filename) <= 6)
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1053 return -1;
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1054
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1055 strncpy(tracknostr, filename + strlen(filename) - 6, 2);
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1056 tracknostr[2] = '\0';
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1057 return strtol(tracknostr, NULL, 10);
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1058 }
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
1059
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
1060 static void cleanup_on_error()
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
1061 {
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
1062 if (playing_track != -1) {
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
1063 playing_track = -1;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
1064 }
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
1065
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
1066 if (trackinfo != NULL) {
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
1067 g_free(trackinfo);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
1068 trackinfo = NULL;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
1069 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
1070 }
1193
483b8d900d5e Added enable/disable debug option
calin.crisan@ldev-006
parents: 1189
diff changeset
1071