audlegacy-plugins: src/madplug/input.c comparison

comparison src/madplug/input.c @ 773:22c82f3c0411 trunk

[svn] - reduce connection latency to http stream. - remove unnecessary functions. - remove redundant dialog which had been shown when madplug failed to open audio output. - some cleanups.

author	yaz
date	Fri, 02 Mar 2007 20:28:55 -0800
parents	1d3f70ac6b31
children	a24cc8848b9a

comparison

equal deleted inserted replaced

-:18dd1dd2d232
+:22c82f3c0411
 #define HEADER_SIZE 256
 #define LINE_LENGTH 256
 extern gboolean scan_file(struct mad_info_t *info, gboolean fast);
-// new VFS handles url.
-static void input_parse_url(struct mad_info_t *info)
-{
-info->filename = g_strdup(info->url);
-return;
-}
 /**
 * init the mad_info_t struct.
 */
 gboolean input_init(struct mad_info_t * info, const char *url)
 {
 info->replaygain_album_peak_str = 0;
 info->replaygain_track_peak_str = 0;
 info->mp3gain_undo_str = 0;
 info->mp3gain_minmax_str = 0;
+// from input_read_replaygain()
+info->has_replaygain = FALSE;
+info->replaygain_album_scale = -1;
+info->replaygain_track_scale = -1;
+info->mp3gain_undo = -77;
+info->mp3gain_minmax = -77;
 info->tuple = NULL;
-input_parse_url(info);
+info->filename = g_strdup(url);
 info->infile = vfs_fopen(info->filename, "rb");
 if (info->infile == NULL) {
 return FALSE;
 }
 g_print("i: string = %s\n", rtn);
 #endif
 return rtn;
 }
+static void input_alloc_tag(struct mad_info_t *info)
+{
+TitleInput *title_input;
+if (info->tuple == NULL) {
+title_input = bmp_title_input_new();
+info->tuple = title_input;
+info->tuple->length = -1; //will be refferd in decoder.c
+}
+else
+title_input = info->tuple;
+}
 /**
 * read the ID3 tag
 */
 static void input_read_tag(struct mad_info_t *info)
 {
 info->tuple = title_input;
 }
 else
 title_input = info->tuple;
-if(info->infile)
+#define REUSE_FD 1
-info->id3file = id3_file_vfsopen(info->infile, ID3_FILE_MODE_READONLY);
+#if REUSE_FD
+if(info->infile) {
+info->id3file = id3_file_vfsopen(info->infile, ID3_FILE_MODE_READONLY);
+}
 else
+#endif
 info->id3file = id3_file_open(info->filename, ID3_FILE_MODE_READONLY);
 if (!info->id3file) {
+#ifdef DEBUG
+g_message("read_tag: no id3file");
+#endif
 return;
 }
 info->tag = id3_file_tag(info->id3file);
 if (!info->tag) {
+#ifdef DEBUG
+g_message("read_tag: no tag");
+#endif
 return;
 }
 title_input->performer =
 input_id3_get_string(info->tag, ID3_FRAME_ARTIST);
 g_message("e: input_read_tag");
 #endif
 }
-static void input_process_remote_metadata(struct mad_info_t *info)
+void input_process_remote_metadata(struct mad_info_t *info)
 {
 if(info->remote && mad_timer_count(info->duration, MAD_UNITS_SECONDS) <= 0){
 gchar *tmp = NULL;
+#ifdef DEBUG
+#ifdef DEBUG_INTENSIVELY
+g_message("process_remote_meta");
+#endif
+#endif
 g_free(info->title);
 info->title = NULL;
 g_free(info->tuple->track_name);
 info->tuple->track_name = NULL;
 g_free(info->tuple->album_name);
 if (info->tuple->track_name && info->tuple->album_name)
 tmp = g_strdup_printf("%s (%s)", info->tuple->track_name, info->tuple->album_name);
 else if (info->tuple->album_name)
 tmp = g_strdup(info->tuple->album_name);
 else
-tmp = g_strdup(""); // really?
+tmp = g_strdup(g_basename(info->filename));
 mad_plugin->set_info(tmp,
 -1, // indicate the stream is unseekable
 info->bitrate, info->freq, info->channels);
 g_free(tmp);
 * For local files this means ID3 tag etc.
 */
 gboolean input_get_info(struct mad_info_t *info, gboolean fast_scan)
 {
 #ifdef DEBUG
-g_message("f: input_get_info: %s, fast_scan = %s", info->title, fast_scan ? "TRUE" : "FALSE");
+g_message("f: input_get_info: %s, fast_scan = %s", info->filename, fast_scan ? "TRUE" : "FALSE");
 #endif                          /* DEBUG */
-input_read_tag(info);
+input_alloc_tag(info);
-input_read_replaygain(info);
+if(!info->remote) { // reduce startup delay
+input_read_tag(info);
+read_replaygain(info);
+}
 /* scan mp3 file, decoding headers */
 if (scan_file(info, fast_scan) == FALSE) {
+#ifdef DEBUG
+g_message("input_get_info: scan_file failed");
+#endif
 return FALSE;
 }
 /* reset the input file to the start */
 vfs_fseek(info->infile, 0, SEEK_SET);
 info->offset = 0;
-input_process_remote_metadata(info);
 /* use the filename for the title as a last resort */
 if (!info->title) {
 char *pos = strrchr(info->filename, DIR_SEPARATOR);
 if (pos)
 if(len == 0){
 	    if(info->playback)
 		    info->playback->eof = TRUE;
 }
-input_process_remote_metadata(info);
 #ifdef DEBUG
 #ifdef DEBUG_INTENSIVELY
 g_message ("e: input_get_data: size=%d offset=%d", len, info->offset);
 #endif
 #endif

Mercurial > audlegacy-plugins

comparison src/madplug/input.c @ 773:22c82f3c0411 trunk