annotate src/cdaudio-ng/cdaudio-ng.c @ 3134:354e90c81253

crossfade: more cleanups
author Michal Lipski <tallica@o2.pl>
date Thu, 07 May 2009 13:13:54 +0200
parents b3402e6f9aaa
children 2fa63d8ef645
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>
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
5 * Portions copyright (c) 2009 John Lindgren <john.lindgren@tds.net>
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
6 *
1508
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
7 * 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
8 * 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
9 * 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
10 *
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
11 * 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
12 * 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
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
14 * GNU General Public License for more details.
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
15 *
a99d8f3b3e7c Fixed some dos/windows eols
Calin Crisan ccrisan@gmail.com
parents: 1490
diff changeset
16 * 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
17 * 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
18 */
1490
032053ca08ab Add CD menu entry is now created with the ui_plugin_menu functions
Calin Crisan ccrisan@gmail.com
parents: 1482
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
2971
3134a0987162 - changed include path from audacious to audlegacy.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 2576
diff changeset
40 #include <audlegacy/plugin.h>
3134a0987162 - changed include path from audacious to audlegacy.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 2576
diff changeset
41 #include <audlegacy/i18n.h>
3134a0987162 - changed include path from audacious to audlegacy.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 2576
diff changeset
42 #include <audlegacy/output.h>
3134a0987162 - changed include path from audacious to audlegacy.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 2576
diff changeset
43 #include <audlegacy/ui_plugin_menu.h>
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
44
1189
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
45 #include "cdaudio-ng.h"
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
46 #include "configure.h"
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
47
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
48
2443
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
49 cdng_cfg_t cdng_cfg;
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
50 static char monitoring = 0;
2443
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
51 static gint firsttrackno = -1;
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
52 static gint lasttrackno = -1;
2433
60936e29c803 reworked cdaudio-ng to avoid gui blockings as much as possible; the plugin now handles cdda:// URL by adding the whole cd to the playlist - to be used with -e argument from command line; the 'no cd' dialog may be broken
Calin Crisan ccrisan@gmail.com
parents: 2419
diff changeset
53 static CdIo_t *pcdio = NULL;
60936e29c803 reworked cdaudio-ng to avoid gui blockings as much as possible; the plugin now handles cdda:// URL by adding the whole cd to the playlist - to be used with -e argument from command line; the 'no cd' dialog may be broken
Calin Crisan ccrisan@gmail.com
parents: 2419
diff changeset
54 static trackinfo_t *trackinfo = NULL;
3058
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
55 static volatile gboolean is_paused = FALSE;
2443
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
56 static gint playing_track = -1;
2433
60936e29c803 reworked cdaudio-ng to avoid gui blockings as much as possible; the plugin now handles cdda:// URL by adding the whole cd to the playlist - to be used with -e argument from command line; the 'no cd' dialog may be broken
Calin Crisan ccrisan@gmail.com
parents: 2419
diff changeset
57 static dae_params_t *pdae_params = NULL;
2443
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
58 static InputPlayback *pglobalinputplayback = NULL;
3111
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
59
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
60 #define N_MENUS 3
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
61 static const int menus [N_MENUS] = {AUDACIOUS_MENU_MAIN,
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
62 AUDACIOUS_MENU_PLAYLIST_ADD, AUDACIOUS_MENU_PLAYLIST_RCLICK};
3120
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
63 static GtkWidget * menu_items [2 * N_MENUS];
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
64
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
65 static void cdaudio_init(void);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
66 static void cdaudio_about(void);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
67 static void cdaudio_configure(void);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
68 static gint cdaudio_is_our_file(gchar *filename);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
69 static void cdaudio_play_file(InputPlayback *pinputplayback);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
70 static void cdaudio_stop(InputPlayback *pinputplayback);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
71 static void cdaudio_pause(InputPlayback *pinputplayback, gshort paused);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
72 static void cdaudio_seek(InputPlayback *pinputplayback, gint time);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
73 static gint cdaudio_get_time(InputPlayback *pinputplayback);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
74 static gint cdaudio_get_volume(gint *l, gint *r);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
75 static gint cdaudio_set_volume(gint l, gint r);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
76 static void cdaudio_cleanup(void);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
77 static void cdaudio_get_song_info(gchar *filename, gchar **title, gint *length);
2443
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
78 static Tuple *cdaudio_get_song_tuple(gchar *filename);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
79
2443
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
80 static Tuple *create_tuple_from_trackinfo_and_filename(gchar *filename);
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
81 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
82 static void *scan_cd(void *nothing);
3058
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
83 static void refresh_trackinfo(void);
2443
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
84 static gboolean show_noaudiocd_info();
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
85 static gint calculate_track_length(gint startlsn, gint endlsn);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
86 static gint find_trackno_from_filename(gchar *filename);
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
87 static void cleanup_on_error(void);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
88
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
89
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
90 static InputPlugin inputplugin = {
1624
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
91 .description = "CD Audio Plugin NG",
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
92 .init = cdaudio_init,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
93 .about = cdaudio_about,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
94 .configure = cdaudio_configure,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
95 .is_our_file = cdaudio_is_our_file,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
96 .play_file = cdaudio_play_file,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
97 .stop = cdaudio_stop,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
98 .pause = cdaudio_pause,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
99 .seek = cdaudio_seek,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
100 .get_time = cdaudio_get_time,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
101 .get_volume = cdaudio_get_volume,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
102 .set_volume = cdaudio_set_volume,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
103 .cleanup = cdaudio_cleanup,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
104 .get_song_info = cdaudio_get_song_info,
db87d84ed8f3 cdaudio-ng: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1529
diff changeset
105 .get_song_tuple = cdaudio_get_song_tuple
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
106 };
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
107
1098
334afe46961c [svn] - cdaudio-ng (aka Zither's CD Audio Plugin): convert to plugin API v2
nenolod
parents: 1048
diff changeset
108 InputPlugin *cdaudio_iplist[] = { &inputplugin, NULL };
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
109
1395
761e17b23e0c added Discovery plugin type
Cristi Magherusan <majeru@atheme-project.org>
parents: 1389
diff changeset
110 DECLARE_PLUGIN(cdaudio, NULL, NULL, cdaudio_iplist, NULL, NULL, NULL, NULL, NULL);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
111
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
112
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
113 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
114 {
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
115 va_list ap;
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
116 fprintf(stderr, "cdaudio-ng: ");
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
117 va_start(ap, fmt);
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
118 vfprintf(stderr, fmt, ap);
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
119 va_end(ap);
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
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
122
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
123 static void debug(const char *fmt, ...)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
124 {
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
125 if (cdng_cfg.debug) {
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
126 va_list ap;
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
127 fprintf(stderr, "cdaudio-ng: ");
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
128 va_start(ap, fmt);
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
129 vfprintf(stderr, fmt, ap);
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
130 va_end(ap);
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
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
134 static char is_our_playlist (Playlist * playlist)
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
135 {
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
136 char found;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
137 int count, length;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
138 char * filename;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
139
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
140 found = 0;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
141 length = aud_playlist_get_length (playlist);
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
142
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
143 for (count = 0; ! found && count < length; count ++)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
144 {
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
145 filename = aud_playlist_get_filename (playlist, count);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
146
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
147 if (cdaudio_is_our_file (filename))
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
148 found = 1;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
149
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
150 g_free (filename);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
151 }
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
152
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
153 return found;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
154 }
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
155
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
156 static void add_cd_to_playlist (Playlist * playlist)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
157 {
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
158 static char filename [] = "cdda://trackxx.cda";
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
159 int track;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
160
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
161 for (track = firsttrackno; track < lasttrackno; track ++)
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
162 {
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
163 filename [12] = '0' + track / 10;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
164 filename [13] = '0' + track % 10;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
165 aud_playlist_add (playlist, filename);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
166 }
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
167 }
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
168
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
169 static void purge_playlist (Playlist * playlist)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
170 {
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
171 int count, length;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
172 char * filename;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
173
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
174 length = aud_playlist_get_length (playlist);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
175
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
176 for (count = 0; count < length; count ++)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
177 {
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
178 filename = aud_playlist_get_filename (playlist, count);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
179
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
180 if (cdaudio_is_our_file (filename))
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
181 {
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
182 aud_playlist_delete_index (playlist, count);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
183 count --;
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
184 length --;
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
185 }
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
186
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
187 g_free (filename);
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
188 }
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
189 }
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
190
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
191 static void purge_all_playlists (void)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
192 {
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
193 GList * list;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
194
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
195 for (list = aud_playlist_get_playlists (); list; list = list->next)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
196 purge_playlist (list->data);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
197 }
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
198
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
199 static void trim_playlist (Playlist * playlist)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
200 {
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
201 int count, length, track;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
202 char * filename;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
203
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
204 length = aud_playlist_get_length (playlist);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
205
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
206 for (count = 0; count < length; count ++)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
207 {
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
208 filename = aud_playlist_get_filename (playlist, count);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
209
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
210 if (cdaudio_is_our_file (filename))
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
211 {
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
212 track = find_trackno_from_filename (filename);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
213
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
214 if (track < firsttrackno || track > lasttrackno)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
215 {
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
216 aud_playlist_delete_index (playlist, count);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
217 count --;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
218 length --;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
219 }
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
220 }
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
221
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
222 g_free (filename);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
223 }
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
224 }
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
225
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
226 static gboolean monitor (void * unused)
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
227 {
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
228 refresh_trackinfo ();
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
229
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
230 if (trackinfo)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
231 return 1;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
232
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
233 monitoring = 0;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
234 purge_all_playlists ();
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
235 return 0;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
236 }
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
237
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
238 static void set_monitor (char set)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
239 {
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
240 static guint source;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
241
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
242 if (set)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
243 {
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
244 if (! monitoring)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
245 source = g_timeout_add_seconds (3, monitor, & source);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
246 }
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
247 else if (monitoring)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
248 g_source_remove (source);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
249
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
250 monitoring = set;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
251 }
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
252
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
253 static void check_playlist (void * p, void * unused)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
254 {
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
255 Playlist * playlist;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
256
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
257 playlist = p;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
258
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
259 if (! is_our_playlist (playlist))
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
260 return;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
261
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
262 if (monitoring)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
263 trim_playlist (playlist);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
264 else
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
265 {
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
266 refresh_trackinfo ();
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
267
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
268 if (trackinfo)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
269 {
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
270 set_monitor (1);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
271 trim_playlist (playlist);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
272 }
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
273 else
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
274 purge_all_playlists ();
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
275 }
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
276 }
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
277
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
278 static char check_disk (void)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
279 {
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
280 if (monitoring)
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
281 return 1;
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
282
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
283 refresh_trackinfo ();
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
284
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
285 if (trackinfo)
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
286 {
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
287 set_monitor (1);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
288 return 1;
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
289 }
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
290
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
291 show_noaudiocd_info ();
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
292 return 0;
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
293 }
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
294
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
295 static void play_cd (void)
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
296 {
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
297 Playlist * playlist;
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
298
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
299 audacious_drct_stop ();
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
300 playlist = aud_playlist_get_active ();
3120
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
301 aud_playlist_clear (playlist);
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
302
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
303 if (! check_disk ())
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
304 return;
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
305
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
306 add_cd_to_playlist (playlist);
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
307 audacious_drct_play ();
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
308 }
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
309
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
310 static void add_cd (void)
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
311 {
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
312 Playlist * playlist;
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
313
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
314 playlist = aud_playlist_get_active ();
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
315 purge_playlist (playlist);
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
316
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
317 if (! check_disk ())
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
318 return;
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
319
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
320 add_cd_to_playlist (playlist);
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
321 }
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
322
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
323 static void cdaudio_init()
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
324 {
2523
769e17da93dd Replaced s/ConfigDb/mcs_handle_t/g, as per changes in the core.
Matti Hamalainen <ccr@tnsp.org>
parents: 2501
diff changeset
325 mcs_handle_t *db;
3111
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
326 int count;
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
327 GtkWidget * 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
328
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
329 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
330
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
331 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
332 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
333 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
334 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
335 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
336 cdng_cfg.cddb_server = g_strdup(CDDA_DEFAULT_CDDB_SERVER);
2558
fb2856249629 now path can be specified for cddb lookup via http.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2523
diff changeset
337 cdng_cfg.cddb_path = g_strdup("");
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
338 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
339 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
340 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
341 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
342 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
343 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
344 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
345 cdng_cfg.proxy_password = g_strdup("");
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
346
2044
ab763bbe6f14 s/bmp_cfg_/aud_cfg_/
Matti Hamalainen <ccr@tnsp.org>
parents: 2043
diff changeset
347 if ((db = aud_cfg_db_open()) == NULL) {
2037
33d6f1dc7cfb Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1967
diff changeset
348 cdaudio_error("Failed to read configuration.\n");
33d6f1dc7cfb Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1967
diff changeset
349 cleanup_on_error();
33d6f1dc7cfb Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1967
diff changeset
350 return;
33d6f1dc7cfb Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1967
diff changeset
351 }
33d6f1dc7cfb Cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 1967
diff changeset
352
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
353 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
354 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
355 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
356 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
357 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
358 aud_cfg_db_get_string(db, "CDDA", "cddbserver", &cdng_cfg.cddb_server);
2558
fb2856249629 now path can be specified for cddb lookup via http.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2523
diff changeset
359 aud_cfg_db_get_string(db, "CDDA", "cddbpath", &cdng_cfg.cddb_path);
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
360 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
361 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
362 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
363 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
364 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
365 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
366 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
367 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
368
2044
ab763bbe6f14 s/bmp_cfg_/aud_cfg_/
Matti Hamalainen <ccr@tnsp.org>
parents: 2043
diff changeset
369 aud_cfg_db_close(db);
1189
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
370
2558
fb2856249629 now path can be specified for cddb lookup via http.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2523
diff changeset
371 debug("use_dae = %d, limitspeed = %d, use_cdtext = %d, use_cddb = %d, cddbserver = \"%s\", cddbpath = \"%s\", cddbport = %d, cddbhttp = %d, device = \"%s\", debug = %d\n",
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
372 cdng_cfg.use_dae, cdng_cfg.limitspeed, cdng_cfg.use_cdtext, cdng_cfg.use_cddb,
2558
fb2856249629 now path can be specified for cddb lookup via http.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2523
diff changeset
373 cdng_cfg.cddb_server, cdng_cfg.cddb_path, 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
374
3058
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
375 if (!cdio_init()) {
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
376 cdaudio_error("Failed to initialize cdio subsystem.\n");
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
377 cleanup_on_error();
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
378 return;
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
379 }
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
380
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
381 libcddb_init();
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
382
3111
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
383 for (count = 0; count < N_MENUS; count ++)
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
384 {
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
385 item = gtk_image_menu_item_new_with_label (_ ("Play CD"));
3111
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
386 gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
387 gtk_image_new_from_stock (GTK_STOCK_CDROM, GTK_ICON_SIZE_MENU));
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
388 gtk_widget_show (item);
3120
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
389 menu_items [2 * count] = item;
3111
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
390 audacious_menu_plugin_item_add (menus [count], item);
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
391 g_signal_connect (G_OBJECT (item), "activate",
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
392 G_CALLBACK (play_cd), NULL);
3120
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
393
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
394 item = gtk_image_menu_item_new_with_label (_ ("Add CD"));
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
395 gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
396 gtk_image_new_from_stock (GTK_STOCK_CDROM, GTK_ICON_SIZE_MENU));
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
397 gtk_widget_show (item);
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
398 menu_items [2 * count + 1] = item;
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
399 audacious_menu_plugin_item_add (menus [count], item);
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
400 g_signal_connect (G_OBJECT (item), "activate",
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
401 G_CALLBACK (add_cd), NULL);
3111
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
402 }
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
403
1997
9d0f5be50219 uri_ to aud_uri_
William Pitcock <nenolod@atheme.org>
parents: 1984
diff changeset
404 aud_uri_set_plugin("cdda://", &inputplugin);
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
405 aud_hook_associate ("playlist load", check_playlist, 0);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
406 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
407
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
408 static void cdaudio_about()
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
409 {
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
410 debug("cdaudio_about()\n");
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
411
1377
4eb2bacab83a Added an information box to cdaudio-ng
Calin Crisan ccrisan@gmail.com
parents: 1349
diff changeset
412 static GtkWidget* about_window = NULL;
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
413
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
414 if (about_window) {
2192
e5401b6c4665 the same thing in many plugins
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2150
diff changeset
415 gtk_window_present(GTK_WINDOW(about_window));
e5401b6c4665 the same thing in many plugins
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2150
diff changeset
416 } else {
e5401b6c4665 the same thing in many plugins
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2150
diff changeset
417 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
418 _("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
419 "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
420 "\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
421 "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
422 "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
423
2192
e5401b6c4665 the same thing in many plugins
Eugene Zagidullin <e.asphyx@gmail.com>
parents: 2150
diff changeset
424 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
425 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
426 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
427
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
428 static void cdaudio_configure()
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
429 {
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
430 debug("cdaudio_configure()\n");
1189
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
431
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
432 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
433
2558
fb2856249629 now path can be specified for cddb lookup via http.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2523
diff changeset
434 debug("use_dae = %d, limitspeed = %d, use_cdtext = %d, use_cddb = %d, cddbserver = \"%s\", cddbpath = \"%s\", cddbport = %d, cddbhttp = %d, device = \"%s\", debug = %d\n",
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
435 cdng_cfg.use_dae, cdng_cfg.limitspeed, cdng_cfg.use_cdtext, cdng_cfg.use_cddb,
2558
fb2856249629 now path can be specified for cddb lookup via http.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2523
diff changeset
436 cdng_cfg.cddb_server, cdng_cfg.cddb_path, cdng_cfg.cddb_port, cdng_cfg.cddb_http, cdng_cfg.device, cdng_cfg.debug);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
437 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
438
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
439 static gint cdaudio_is_our_file(gchar *filename)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
440 {
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
441 return ! strncmp (filename, "cdda://", 7);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
442 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
443
2043
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
444
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
445 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
446 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
447 {
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
448 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
449 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
450 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
451 }
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
452
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
453
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
454 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
455 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
456 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
457 {
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
458 t->startlsn = startlsn;
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
459 t->endlsn = endlsn;
2043
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
460 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
461 }
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
462
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
463
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
464 static void cdaudio_play_file(InputPlayback *pinputplayback)
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
465 {
1466
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
466 Tuple *tuple;
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
467 gchar *title;
3111
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
468
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
469 debug("cdaudio_play_file(\"%s\")\n", pinputplayback->filename);
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
470
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
471 if (! check_disk ())
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
472 return;
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
473
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
474 pglobalinputplayback = pinputplayback;
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
475
3058
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
476 gint trackno = find_trackno_from_filename(pinputplayback->filename);
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
477
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
478 if (trackno < firsttrackno || trackno > lasttrackno) {
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
479 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
480 cleanup_on_error();
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
481 return;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
482 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
483
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
484 pinputplayback->playing = TRUE;
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
485 playing_track = trackno;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
486 is_paused = FALSE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
487
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
488 tuple = create_tuple_from_trackinfo_and_filename(pinputplayback->filename);
2055
2f2ffbc2d04d gentitle changes
William Pitcock <nenolod@atheme.org>
parents: 2049
diff changeset
489 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
490
1984
489e32a8e106 change some places to use set_params() instead of set_info() directly
William Pitcock <nenolod@atheme.org>
parents: 1976
diff changeset
491 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
492 g_free(title);
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1967
diff changeset
493 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
494
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
495 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
496 debug("using digital audio extraction\n");
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
497
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
498 if (pdae_params != NULL) {
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
499 cdaudio_error("DAE playback seems to be already started.\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
500 return;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
501 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
502
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
503 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
504 cdaudio_error("Failed to open audio output.\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
505 cleanup_on_error();
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
506 return;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
507 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
508
1349
ab387ad5b88e Converted to new threading model
Calin Crisan ccrisan@gmail.com
parents: 1341
diff changeset
509 /*
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
510 debug("starting dae thread...\n");
1349
ab387ad5b88e Converted to new threading model
Calin Crisan ccrisan@gmail.com
parents: 1341
diff changeset
511 */
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
512 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
513 pdae_params->startlsn = trackinfo[trackno].startlsn;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
514 pdae_params->endlsn = trackinfo[trackno].endlsn;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
515 pdae_params->pplayback = pinputplayback;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
516 pdae_params->seektime = -1;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
517 pdae_params->currlsn = trackinfo[trackno].startlsn;
1349
ab387ad5b88e Converted to new threading model
Calin Crisan ccrisan@gmail.com
parents: 1341
diff changeset
518 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
519 pinputplayback->set_pb_ready(pinputplayback);
1349
ab387ad5b88e Converted to new threading model
Calin Crisan ccrisan@gmail.com
parents: 1341
diff changeset
520 dae_play_loop(pdae_params);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
521 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
522 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
523 debug("not using digital audio extraction\n");
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
524
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
525 msf_t startmsf, endmsf;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
526 cdio_lsn_to_msf(trackinfo[trackno].startlsn, &startmsf);
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
527 cdio_lsn_to_msf(trackinfo[trackno].endlsn, &endmsf);
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
528 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
529 cdaudio_error("Failed to play analog audio CD.\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
530 cleanup_on_error();
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
531 return;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
532 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
533 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
534 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
535
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
536 static void cdaudio_stop(InputPlayback *pinputplayback)
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
537 {
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
538 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
539
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
540 pglobalinputplayback = NULL;
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
541
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
542 if (playing_track == -1)
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
543 return;
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
544
1303
2a7c9e0b9c0f Added configure options for cddb
zither@litestep.network
parents: 1282
diff changeset
545 if (pinputplayback != NULL)
2a7c9e0b9c0f Added configure options for cddb
zither@litestep.network
parents: 1282
diff changeset
546 pinputplayback->playing = FALSE;
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
547 playing_track = -1;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
548 is_paused = FALSE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
549
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
550 if (cdng_cfg.use_dae) {
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
551 if (pdae_params != NULL) {
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
552 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
553 g_free(pdae_params);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
554 pdae_params = NULL;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
555 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
556 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
557 else {
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
558 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
559 cdaudio_error("Failed to stop analog CD.\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
560 return;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
561 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
562 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
563 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
564
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
565 static void cdaudio_pause(InputPlayback *pinputplayback, gshort paused)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
566 {
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
567 debug("cdaudio_pause(\"%s\", %d)\n", pinputplayback->filename, paused);
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
568
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
569 if (!is_paused) {
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
570 is_paused = TRUE;
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
571 if (!cdng_cfg.use_dae)
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
572 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
573 cdaudio_error("Failed to pause analog CD!\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
574 cleanup_on_error();
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
575 return;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
576 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
577 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
578 else {
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
579 is_paused = FALSE;
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
580 if (!cdng_cfg.use_dae)
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
581 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
582 cdaudio_error("Failed to resume analog CD!\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
583 cleanup_on_error();
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
584 return;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
585 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
586 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
587 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
588
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
589 static void cdaudio_seek(InputPlayback *pinputplayback, gint time)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
590 {
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
591 debug("cdaudio_seek(\"%s\", %d)\n", pinputplayback->filename, time);
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
592
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
593 if (playing_track == -1)
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
594 return;
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
595
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
596 if (cdng_cfg.use_dae) {
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
597 if (pdae_params != NULL) {
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
598 pdae_params->seektime = time * 1000;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
599 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
600 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
601 else {
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
602 gint newstartlsn = trackinfo[playing_track].startlsn + time * 75;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
603 msf_t startmsf, endmsf;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
604 cdio_lsn_to_msf(newstartlsn, &startmsf);
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
605 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
606
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
607 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
608 cdaudio_error("Failed to play analog CD\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
609 cleanup_on_error();
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
610 return;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
611 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
612 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
613 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
614
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
615 static gint cdaudio_get_time(InputPlayback *pinputplayback)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
616 {
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
617 if (playing_track == -1)
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
618 return -1;
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
619
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
620 if (!cdng_cfg.use_dae) {
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
621 cdio_subchannel_t subchannel;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
622 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
623 cdaudio_error("Failed to read analog CD subchannel.\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
624 cleanup_on_error();
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
625 return 0;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
626 }
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
627 gint currlsn = cdio_msf_to_lsn(&subchannel.abs_addr);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
628
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
629 /* 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
630 if (currlsn == trackinfo[playing_track].endlsn)
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
631 return -1;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
632
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
633 return calculate_track_length(trackinfo[playing_track].startlsn, currlsn);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
634 }
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
635 else {
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
636 if (pdae_params != NULL)
1314
b93270e2b7e4 Continuous playing in DAE mode works again
Calin Crisan ccrisan@gmail.com
parents: 1313
diff changeset
637 if (pdae_params->pplayback->playing)
b93270e2b7e4 Continuous playing in DAE mode works again
Calin Crisan ccrisan@gmail.com
parents: 1313
diff changeset
638 return pinputplayback->output->output_time();
b93270e2b7e4 Continuous playing in DAE mode works again
Calin Crisan ccrisan@gmail.com
parents: 1313
diff changeset
639 else
b93270e2b7e4 Continuous playing in DAE mode works again
Calin Crisan ccrisan@gmail.com
parents: 1313
diff changeset
640 return -1;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
641 else
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
642 return -1;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
643 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
644 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
645
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
646 static gint cdaudio_get_volume(gint *l, gint *r)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
647 {
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
648 if (cdng_cfg.use_dae) {
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
649 *l = *r = 0;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
650 return FALSE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
651 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
652 else {
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
653 cdio_audio_volume_t volume;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
654 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
655 cdaudio_error("Failed to retrieve analog CD volume.\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
656 cleanup_on_error();
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
657 *l = *r = 0;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
658 return FALSE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
659 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
660 *l = volume.level[0];
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
661 *r = volume.level[1];
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
662
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
663 return TRUE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
664 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
665 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
666
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
667 static gint cdaudio_set_volume(gint l, gint r)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
668 {
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
669 debug("cdaudio_set_volume(%d, %d)\n", l, r);
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
670
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
671 if (cdng_cfg.use_dae) {
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
672 return FALSE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
673 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
674 else {
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
675 cdio_audio_volume_t volume = {{l, r, 0, 0}};
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
676 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
677 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
678 cleanup_on_error();
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
679 return FALSE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
680 }
1382
28766475ca0a More and more translatable strings... ;-)
Stany HENRY <StrassBoy@gmail.com>
parents: 1378
diff changeset
681
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
682 return TRUE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
683 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
684 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
685
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
686 static void cdaudio_cleanup(void)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
687 {
3111
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
688 int count;
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
689
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
690 debug("cdaudio_cleanup()\n");
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
691
3111
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
692 for (count = 0; count < N_MENUS; count ++)
3120
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
693 {
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
694 audacious_menu_plugin_item_remove (menus [count],
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
695 menu_items [2 * count]);
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
696 audacious_menu_plugin_item_remove (menus [count],
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
697 menu_items [2 * count + 1]);
b3402e6f9aaa Some minor changes; shuffle works again for CDs.
John Lindgren <john.lindgren@tds.net>
parents: 3119
diff changeset
698 }
3111
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
699
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
700 aud_hook_dissociate ("playlist load", check_playlist);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
701 set_monitor (0);
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
702
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
703 if (pcdio != NULL) {
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
704 if (playing_track != -1 && !cdng_cfg.use_dae)
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
705 cdio_audio_stop(pcdio);
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
706 cdio_destroy(pcdio);
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
707 pcdio = NULL;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
708 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
709 if (trackinfo != NULL) {
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
710 g_free(trackinfo);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
711 trackinfo = NULL;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
712 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
713 playing_track = -1;
1282
ced2aa634901 Added cddb support
zither@litestep.network
parents: 1194
diff changeset
714
3058
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
715 libcddb_shutdown();
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
716
1189
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
717 // todo: destroy the gui
af5bd4592100 Added cdaudio-ng.h; added a configure dialog
zither@litestep.network
parents: 1125
diff changeset
718
2523
769e17da93dd Replaced s/ConfigDb/mcs_handle_t/g, as per changes in the core.
Matti Hamalainen <ccr@tnsp.org>
parents: 2501
diff changeset
719 mcs_handle_t *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
720 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
721 aud_cfg_db_set_int(db, "CDDA", "limitspeed", cdng_cfg.limitspeed);
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
722 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
723 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
724 aud_cfg_db_set_string(db, "CDDA", "cddbserver", cdng_cfg.cddb_server);
2558
fb2856249629 now path can be specified for cddb lookup via http.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2523
diff changeset
725 aud_cfg_db_set_string(db, "CDDA", "cddbpath", cdng_cfg.cddb_path);
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
726 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
727 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
728 aud_cfg_db_set_string(db, "CDDA", "device", cdng_cfg.device);
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
729 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
730 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
731
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
732 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
733
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
734 static void cdaudio_get_song_info(gchar *filename, gchar **title, gint *length)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
735 {
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
736 debug("cdaudio_get_song_info(\"%s\")\n", filename);
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
737
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
738 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
739 int trackno = find_trackno_from_filename(filename);
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
740
2046
040827f0b083 Primary cleanup pass.
Matti Hamalainen <ccr@tnsp.org>
parents: 2045
diff changeset
741 if (tuple) {
2055
2f2ffbc2d04d gentitle changes
William Pitcock <nenolod@atheme.org>
parents: 2049
diff changeset
742 *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
743 aud_tuple_free(tuple);
1466
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
744 tuple = NULL;
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
745 }
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
746 *length = calculate_track_length(trackinfo[trackno].startlsn, trackinfo[trackno].endlsn);
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
747 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
748
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
749 static Tuple *cdaudio_get_song_tuple(gchar *filename)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
750 {
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
751 debug("cdaudio_get_song_tuple(\"%s\")\n", filename);
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
752
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
753 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
754 }
4ca99d2be90e Titles are now built using tuples, with the preferred format
Calin Crisan ccrisan@gmail.com
parents: 1340
diff changeset
755
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
756 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
757 {
2043
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
758 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
759
3119
e0b95157aa33 Remove non-existant CD tracks from playlist. Sorry, Luis, I guess you were outvoted.
John Lindgren <john.lindgren@tds.net>
parents: 3116
diff changeset
760 if (! check_disk ())
2043
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
761 return tuple;
1389
e2754a023ae0 Fixed surprise eject segfault
Calin Crisan ccrisan@gmail.com
parents: 1388
diff changeset
762
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
763 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
764
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
765 if (trackno < firsttrackno || trackno > lasttrackno)
2043
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
766 return tuple;
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
767
1466
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
768 if(strlen(trackinfo[trackno].performer)) {
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1967
diff changeset
769 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
770 }
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
771 if(strlen(trackinfo[0].name)) {
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1967
diff changeset
772 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
773 }
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
774 if(strlen(trackinfo[trackno].name)) {
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1967
diff changeset
775 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
776 }
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
777
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1967
diff changeset
778 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
779 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
780
2043
624effc5a687 Clean up the str(n)cpy mess somewhat.
Matti Hamalainen <ccr@tnsp.org>
parents: 2042
diff changeset
781 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
782 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
783
1466
a0b4583a5e48 tuple API update.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 1447
diff changeset
784 if(strlen(trackinfo[trackno].genre)) {
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1967
diff changeset
785 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
786 }
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
787 //tuple->year = 0; todo: set the year
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
788
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
789 return tuple;
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
790 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
791
2995
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
792 static void do_seek (dae_params_t * pdae_params) {
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
793 pdae_params->pplayback->output->flush(pdae_params->seektime);
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
794 pdae_params->currlsn = pdae_params->startlsn + (pdae_params->seektime * 75 / 1000);
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
795 cdio_lseek(pcdio, pdae_params->currlsn * CDIO_CD_FRAMESIZE_RAW, SEEK_SET);
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
796 pdae_params->seektime = -1;
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
797 }
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
798
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
799 static void do_pause (dae_params_t * pdae_params) {
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
800 pdae_params->pplayback->output->pause (1);
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
801 while (is_paused) {
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
802 if (pdae_params->seektime != -1)
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
803 do_seek (pdae_params);
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
804 g_usleep(50000);
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
805 }
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
806 pdae_params->pplayback->output->pause (0);
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
807 }
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
808
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
809 static void dae_play_loop(dae_params_t *pdae_params)
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
810 {
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
811 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
812
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
813 debug("dae started\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
814 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
815
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
816 gint read_error_counter = 0;
1125
4a5d64c395f5 [svn] Added a lot of useful debug output
zither
parents: 1123
diff changeset
817
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
818 //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
819
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
820 while (pdae_params->pplayback->playing) {
2995
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
821 if (pdae_params->seektime != -1)
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
822 do_seek (pdae_params);
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
823 if (is_paused)
1192140d9e3f Patch from John Lindgren <john.lindgren@tds.net> to support seeking whilst paused, Debian bug #517692.
Tony Vroon <chainsaw@gentoo.org>
parents: 2971
diff changeset
824 do_pause (pdae_params);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
825
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
826 /* 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
827 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
828
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
829 /* 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
830 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
831 sleep(3);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
832 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
833 }
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
834
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
835 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
836 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
837 read_error_counter++;
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
838 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
839 read_error_counter = 0;
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
840 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
841 break;
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
842 }
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
843 }
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
844 else
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
845 read_error_counter = 0;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
846
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
847 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
848 guchar *bytebuff = buffer;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
849 while (pdae_params->pplayback->playing && remainingbytes > 0 && pdae_params->seektime == -1) {
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
850 /* 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
851 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
852
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
853 /* wait until the output buffer has enough room */
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
854 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
855 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
856
2047
627e1069ef33 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 2046
diff changeset
857 /* play the sound :) */
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
858 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
859 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
860 bytecount, bytebuff, &pdae_params->pplayback->playing);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
861 remainingbytes -= bytecount;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
862 bytebuff += bytecount;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
863 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
864 pdae_params->currlsn += lsncount;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
865 }
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
866 debug("dae ended\n");
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
867
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
868 pdae_params->pplayback->playing = FALSE;
1314
b93270e2b7e4 Continuous playing in DAE mode works again
Calin Crisan ccrisan@gmail.com
parents: 1313
diff changeset
869 pdae_params->pplayback->output->close_audio();
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
870 is_paused = FALSE;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
871
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
872 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
873 g_free(buffer);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
874 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
875
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
876 static void destroy_dialog (GtkWidget * dialog, gint response,
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
877 GtkWidget * * reference)
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
878 {
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
879 gtk_widget_destroy (dialog);
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
880 * reference = 0;
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
881 }
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
882
2443
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
883 static gboolean show_noaudiocd_info()
3111
7c27b8612b7e Show "Add CD" command on playlist "Add" menu (closes #41)
John Lindgren <john.lindgren@tds.net>
parents: 3058
diff changeset
884 {
2433
60936e29c803 reworked cdaudio-ng to avoid gui blockings as much as possible; the plugin now handles cdda:// URL by adding the whole cd to the playlist - to be used with -e argument from command line; the 'no cd' dialog may be broken
Calin Crisan ccrisan@gmail.com
parents: 2419
diff changeset
885 const gchar *markup =
2443
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
886 N_("<b><big>No playable CD found.</big></b>\n\n"
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
887 "No CD inserted, or inserted CD is not an audio CD.\n");
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
888 static GtkWidget * dialog = 0;
2433
60936e29c803 reworked cdaudio-ng to avoid gui blockings as much as possible; the plugin now handles cdda:// URL by adding the whole cd to the playlist - to be used with -e argument from command line; the 'no cd' dialog may be broken
Calin Crisan ccrisan@gmail.com
parents: 2419
diff changeset
889
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
890 if (dialog)
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
891 gtk_window_present (GTK_WINDOW (dialog));
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
892 else
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
893 {
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
894 dialog = gtk_message_dialog_new_with_markup (NULL,
2443
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
895 GTK_DIALOG_DESTROY_WITH_PARENT,
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
896 GTK_MESSAGE_ERROR,
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
897 GTK_BUTTONS_OK,
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
898 _(markup));
3116
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
899 gtk_widget_show (dialog);
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
900 g_signal_connect (G_OBJECT (dialog), "response",
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
901 G_CALLBACK (destroy_dialog), & dialog);
b09c922c9f34 Finish fixing hang-ups; remove confusing and broken "rescan"; handle no-disk more gracefully.
John Lindgren <john.lindgren@tds.net>
parents: 3111
diff changeset
902 }
2443
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
903
32d4d5f7020b Fixed the nocd-dialog; however it may still crash when starting audacious with cdda:// argument
Calin Crisan ccrisan@gmail.com
parents: 2433
diff changeset
904 return TRUE;
2433
60936e29c803 reworked cdaudio-ng to avoid gui blockings as much as possible; the plugin now handles cdda:// URL by adding the whole cd to the playlist - to be used with -e argument from command line; the 'no cd' dialog may be broken
Calin Crisan ccrisan@gmail.com
parents: 2419
diff changeset
905 }
60936e29c803 reworked cdaudio-ng to avoid gui blockings as much as possible; the plugin now handles cdda:// URL by adding the whole cd to the playlist - to be used with -e argument from command line; the 'no cd' dialog may be broken
Calin Crisan ccrisan@gmail.com
parents: 2419
diff changeset
906
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
907 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
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 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
910
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 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
912
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 /* 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
914 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
915 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
916 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
917 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
918 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
919 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 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
922 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
923 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
924 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
925 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
926 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
927 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
928 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
929 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
930 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 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
932 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 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
934 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
935 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
936 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
937 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 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
939 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
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
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 /* 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
943 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
944 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
945 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
946 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
947 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
948
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
949 /* 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
950 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
951 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
952 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
953 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
954 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
955 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
956 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
957 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
958 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
959
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 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
961 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
962
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 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
964 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
965 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
966 "", "", "");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 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
969 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
970 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
971 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
972 "", "", "");
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 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
975 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
976 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
977 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
978 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 /* 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
982 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
983 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
984 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
985 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
986 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
987 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 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
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 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
991 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
992 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
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 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 /* 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
997 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
998 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
999 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
1000 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
1001 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
1002 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
1003 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
1004 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
1005 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
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
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 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
1010 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
1011 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
1012 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
1013 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
1014 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
1015 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 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
1017 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
1018 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
1019 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 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
1023 /* 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
1024 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
1025 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
1026 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
1027 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
1028
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a 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 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
1030 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
1031 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
1032 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
1033 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
1034 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
1035
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
1036 cddb_cache_enable(pcddb_conn);
2433
60936e29c803 reworked cdaudio-ng to avoid gui blockings as much as possible; the plugin now handles cdda:// URL by adding the whole cd to the playlist - to be used with -e argument from command line; the 'no cd' dialog may be broken
Calin Crisan ccrisan@gmail.com
parents: 2419
diff changeset
1037 // cddb_cache_set_dir(pcddb_conn, "~/.cddbslave");
2384
0824c92b6132 - fixed a bug which writes TRUE as the default port number.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2326
diff changeset
1038
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
1039 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
1040 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
1041 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
1042 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
1043 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
1044 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
1045 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
1046 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
1047 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1048 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
1049 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
1050 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
1051 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
1052 cddb_set_server_port(pcddb_conn, cdng_cfg.cddb_port);
2558
fb2856249629 now path can be specified for cddb lookup via http.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2523
diff changeset
1053 cddb_set_http_path_query(pcddb_conn, cdng_cfg.cddb_path);
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
1054 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1055 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
1056 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
1057 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
1058 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1059
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1060 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
1061
944a510f5200 - now cdaudio-ng calculates discid correctly. closes #165
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 2384
diff changeset
1062 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
1063 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
1064
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
1065 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
1066 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
1067 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
1068 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
1069 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1070
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1071 cddb_disc_calc_discid(pcddb_disc);
2453
e3225b9b3e59 Use glib types consistently.
Matti Hamalainen <ccr@tnsp.org>
parents: 2443
diff changeset
1072 guint 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
1073 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
1074
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1075 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
1076 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
1077 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
1078 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
1079 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
1080 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
1081
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1082 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
1083 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
1084 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1085 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
1086 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
1087 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
1088
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1089 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
1090 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
1091 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1092 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
1093 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
1094
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1095 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
1096 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
1097 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
1098 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
1099 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
1100 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1101 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
1102 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
1103 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
1104 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
1105 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
1106 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
1107
2453
e3225b9b3e59 Use glib types consistently.
Matti Hamalainen <ccr@tnsp.org>
parents: 2443
diff changeset
1108 gint 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
1109 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
1110 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
1111 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
1112 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
1113 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
1114 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
1115 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1116 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1117 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1118 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1119 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1120 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1121
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1122 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
1123 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
1124
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1125 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
1126 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
1127 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1128
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1129 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
1130 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
1131 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
1132
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1133 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
1134 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
1135 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
1136 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1137 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1138
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1139 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
1140
3058
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
1141 return NULL;
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
1142 }
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
1143
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
1144 static void refresh_trackinfo (void)
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
1145 {
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
1146 if (pcdio == NULL || cdio_get_media_changed(pcdio) || ! trackinfo) {
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
1147 debug(pcdio ? "CD changed, rescanning\n"
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
1148 : "no CD information, scanning\n");
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
1149 scan_cd(NULL);
2e649bf16ebc Robust media change handling written by John Wehle, closes bug #46.
Tony Vroon <chainsaw@gentoo.org>
parents: 2995
diff changeset
1150 }
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
1151 }
854b5fae995e 1) cdaudio-ng tries to fetch cd information in a background thread, and 2) cdaudio-ng no longer queries the cddb if cdtext is available
Calin Crisan ccrisan@gmail.com
parents: 2256
diff changeset
1152
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
1153 static gint calculate_track_length(gint startlsn, gint endlsn)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1154 {
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1155 return ((endlsn - startlsn + 1) * 1000) / 75;
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1156 }
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1157
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
1158 static gint find_trackno_from_filename(gchar *filename)
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1159 {
2040
997c71881e5b No need for that long buffer.
Matti Hamalainen <ccr@tnsp.org>
parents: 2038
diff changeset
1160 gchar tracknostr[3];
1048
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1161 if ((filename == NULL) || strlen(filename) <= 6)
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1162 return -1;
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1163
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1164 strncpy(tracknostr, filename + strlen(filename) - 6, 2);
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1165 tracknostr[2] = '\0';
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1166 return strtol(tracknostr, NULL, 10);
a42f95563c98 [svn] Added cdaudio-ng
zither
parents:
diff changeset
1167 }
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
1168
1959
3fef1171cd6c Basic start of cleanup of cdaudio-ng.
Matti Hamalainen <ccr@tnsp.org>
parents: 1958
diff changeset
1169 static void cleanup_on_error()
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
1170 {
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
1171 if (playing_track != -1) {
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
1172 playing_track = -1;
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
1173 }
1313
28df54b3eaea Ejecting the cd while playing no longer crashes the player.
Calin Crisan ccrisan@gmail.com
parents: 1303
diff changeset
1174
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
1175 if (trackinfo != NULL) {
1958
2db72dd92ee3 Use glib types and functions in some places.
Matti Hamalainen <ccr@tnsp.org>
parents: 1708
diff changeset
1176 g_free(trackinfo);
1123
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
1177 trackinfo = NULL;
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
1178 }
edf2a1f1e58b [svn] Implemented DAE feature (enabled by default)
zither
parents: 1098
diff changeset
1179 }
1193
483b8d900d5e Added enable/disable debug option
calin.crisan@ldev-006
parents: 1189
diff changeset
1180