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

comparison src/madplug/plugin.c @ 2205:2faee266ea1e

madplug now provides more informative tuple

author	Eugene Zagidullin <e.asphyx@gmail.com>
date	Tue, 04 Dec 2007 02:04:49 +0300
parents	13b8ab116b69
children	7c7e6f5c494e

comparison

equal deleted inserted replaced

-:43da009d6e76
+:2faee266ea1e
 #ifdef DEBUG
 g_message("e: audmad_get_song_info");
 #endif                          /* DEBUG */
 }
-static void
+static gboolean
-audmad_get_song_length(char *url, int *length, VFSFile *fd)
+audmad_fill_info(struct mad_info_t *info, VFSFile *fd)
 {
-struct mad_info_t myinfo;
+if (fd == NULL || info == NULL) return FALSE;
 #ifdef DEBUG
-gchar *tmp = g_filename_to_utf8(url, -1, NULL, NULL, NULL);
+g_message("f: audmad_fill_info(): %s", fd->uri);
-g_message("f: audmad_get_song_length: %s", tmp);
+#endif
-g_free(tmp);
-#endif                          /* DEBUG */
+if (input_init(info, fd->uri, fd) == FALSE) {
+#ifdef DEBUG
-if (input_init(&myinfo, url, fd ? fd : NULL) == FALSE) {
+g_message("audmad_fill_info(): error initialising input");
-#ifdef DEBUG
+#endif
-g_message("error initialising input");
+return FALSE;
-#endif
+}
-return;
-}
+info->fileinfo_request = FALSE; /* we don't need to read tuple again */
+return input_get_info(info, aud_vfs_is_remote(fd->uri) ? TRUE : audmad_config.fast_play_time_calc);
-if (input_get_info(&myinfo, info.remote ? TRUE : audmad_config.fast_play_time_calc) == TRUE) {
-*length = aud_tuple_get_int(myinfo.tuple, FIELD_LENGTH, NULL);
-if(*length == -1)
-*length = mad_timer_count(myinfo.duration, MAD_UNITS_MILLISECONDS);
-}
-else {
-*length = -1;
-}
-input_term(&myinfo);
-#ifdef DEBUG
-g_message("e: audmad_get_song_info");
-#endif                          /* DEBUG */
 }
 static void audmad_about()
 {
 static GtkWidget *aboutbox;
 gchar *realfn = NULL;
 struct id3_file *id3file = NULL;
 struct id3_tag *tag = NULL;
+struct mad_info_t myinfo;
 gboolean local_fd = FALSE;
+int length;
 #ifdef DEBUG
 string = aud_str_to_utf8(filename);
 g_message("f: mad: audmad_get_song_tuple: %s", string);
 g_free(string);
 string = NULL;
 #endif
+/* isn't is obfuscated? --eugene */
 if(info.remote && mad_timer_count(info.duration, MAD_UNITS_SECONDS) <= 0){
 if((fd && aud_vfs_is_streaming(fd)) || (info.playback && info.playback->playing)) {
 gchar *tmp = NULL;
 tuple = aud_tuple_new_from_filename(filename);
 if(!fd) {
 fd = aud_vfs_fopen(filename, "rb");
 if(!fd)
 return NULL;
 local_fd = TRUE;
+}
+if (!audmad_fill_info(&myinfo, fd)) {
+#ifdef DEBUG
+g_message("get_song_tuple: error obtaining info\n");
+#endif
+if (local_fd) aud_vfs_fclose(fd);
+return NULL;
 }
 tuple = aud_tuple_new();
 aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL, -1);
 __set_and_free(tuple, FIELD_FILE_PATH, NULL, g_path_get_dirname(realfn ? realfn : filename));
 aud_tuple_associate_string(tuple, FIELD_FILE_EXT, NULL, extname(realfn ? realfn : filename));
 g_free(realfn); realfn = NULL;
 // length
-string = input_id3_get_string(tag, "TLEN");
+length = mad_timer_count(myinfo.duration, MAD_UNITS_MILLISECONDS);
-if (string) {
+aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL, length);
-aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL, atoi(string));
-#ifdef DEBUG
-g_message("get_song_tuple: TLEN = %d", aud_tuple_get_int(tuple, FIELD_LENGTH, NULL));
-#endif
-g_free(string);
-string = NULL;
-}
-else {
-char *dummy = NULL;
-int length = 0;
-audmad_get_song_length(filename, &length, fd);
-aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL, length);
-g_free(dummy);
-}
 // track number
 string = input_id3_get_string(tag, ID3_FRAME_TRACK);
 if (string) {
 aud_tuple_associate_int(tuple, FIELD_TRACK_NUMBER, NULL, atoi(string));
 __set_and_free(tuple, FIELD_FILE_NAME, NULL, g_path_get_basename(realfn ? realfn : filename));
 __set_and_free(tuple, FIELD_FILE_PATH, NULL, g_path_get_dirname(realfn ? realfn : filename));
 aud_tuple_associate_string(tuple, FIELD_FILE_EXT, NULL, extname(realfn ? realfn : filename));
 g_free(realfn); realfn = NULL;
 // length
-{
+length = mad_timer_count(myinfo.duration, MAD_UNITS_MILLISECONDS);
-char *dummy = NULL;
+aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL, length);
-int length = 0;
+}
-if(aud_tuple_get_int(tuple, FIELD_LENGTH, NULL) == -1) {
-audmad_get_song_length(filename, &length, fd);
+if (myinfo.vbr) {
-aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL, length);
+string = g_strdup_printf("lossy, bitrate: VBR (avg. %d kbps)", myinfo.bitrate / 1000);
-}
+} else {
-g_free(dummy);
+string = g_strdup_printf("lossy, bitrate: %d kbps", myinfo.bitrate / 1000);
 }
-}
+aud_tuple_associate_string(tuple, FIELD_QUALITY, NULL, string);
+g_free(string);
-/* TUDO: make tuple more informative (bitrate, layer).
-* but it can slowdown tuple creation and avoid sense of TLEN reading. --eugene */
+string = g_strdup_printf("MPEG-1 Audio Layer %d", myinfo.mpeg_layer);
+aud_tuple_associate_string(tuple, FIELD_CODEC, NULL, string);
-aud_tuple_associate_string(tuple, FIELD_QUALITY, NULL, "lossy");
+g_free(string);
-aud_tuple_associate_string(tuple, FIELD_CODEC, NULL, "MPEG Audio (MP3)");
 aud_tuple_associate_string(tuple, FIELD_MIMETYPE, NULL, "audio/mpeg");
+input_term(&myinfo);
 if(local_fd)
 aud_vfs_fclose(fd);
 #ifdef DEBUG

Mercurial > audlegacy-plugins

comparison src/madplug/plugin.c @ 2205:2faee266ea1e