annotate src/cdaudio-ng/cdaudio-ng.c @ 2576:bd3a24b39058

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