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

comparison src/madplug/plugin.c @ 768:1d3f70ac6b31 trunk

[svn] - remote metadata handling is moved into input_process_remote_metadata(). this function converts string into utf-8 if necessary (mainly for zina). - revise seekable determination logic. duration may be negative value (zina..). - if remote url is passed, scan_file() will use fast scan method irrespective of preference value. - scattered http:// matching codes are aggregate into audmad_is_remote(). - some cleanups.

author	yaz
date	Fri, 02 Mar 2007 00:14:11 -0800
parents	2430c9773fa7
children	22c82f3c0411

comparison

equal deleted inserted replaced

-:96b884703411
+:1d3f70ac6b31
 return ((unsigned long) hbuf[0] << 24) |
 ((unsigned long) hbuf[1] << 16) |
 ((unsigned long) hbuf[2] << 8) | (unsigned long) hbuf[3];
 }
+gboolean audmad_is_remote(gchar *url)
+{
+if (!strncasecmp("http://", url, 7) || !strncasecmp("https://", url, 8))
+return TRUE;
+else
+return FALSE;
+}
 // audacious vfs fast version
 static int audmad_is_our_fd(char *filename, VFSFile *fin)
 {
 guint32 check;
 guchar tmp[4096];
 gint ret, i;
 info.remote = FALSE;
-#if 1
+if(audmad_is_remote(filename))
-// XXX: temporary fix
-if (!strncasecmp("http://", filename, 7) || !strncasecmp("https://", filename, 8))
-{
-#ifdef DEBUG
-g_message("audmad_is_our_fd: remote");
-#endif
 info.remote = TRUE;
-}
-#endif
 /* I've seen some flac files beginning with id3 frames..
 so let's exclude known non-mp3 filename extensions */
 if ((ext != NULL) &&
 (!strcasecmp("flac", ext) || !strcasecmp("mpc", ext) ||
 if (input_init(&info, url) == FALSE) {
 g_message("error initialising input");
 return;
 }
-rtn = input_get_info(&info, audmad_config.fast_play_time_calc);
+// remote access must use fast scan.
+rtn = input_get_info(&info, audmad_is_remote(url) ? TRUE : audmad_config.fast_play_time_calc);
 if (rtn == FALSE) {
 g_message("error reading input info");
 return;
 }
 return;
 }
 // don't try to get from stopped stream.
 if(myinfo.remote && (!myinfo.playback || !myinfo.playback->playing)){
-g_print("get_song_info: remote!\n");
+#ifdef DEBUG
+g_message("get_song_info: remote and not playing.");
+#endif
 return;
 }
 if (input_get_info(&myinfo, info.remote ? TRUE : audmad_config.fast_play_time_calc) == TRUE) {
 if(myinfo.tuple->track_name)
 g_message("f: mad: audmad_get_song_tuple: %s", string);
 g_free(string);
 string = NULL;
 #endif
-if(info.remote && mad_timer_count(info.duration, MAD_UNITS_SECONDS) == 0){
+if(info.remote && mad_timer_count(info.duration, MAD_UNITS_SECONDS) <= 0){
 if(info.playback && info.playback->playing) {
+gchar *tmp = NULL;
 tuple = bmp_title_input_new();
 #ifdef DEBUG
-printf("info.playback->playing = %d\n",info.playback->playing);
+g_message("info.playback->playing = %d",info.playback->playing);
 #endif
-tuple->track_name = vfs_get_metadata(info.infile, "track-name");
+tmp = vfs_get_metadata(info.infile, "track-name");
-tuple->album_name = vfs_get_metadata(info.infile, "stream-name");
+if(tmp){
-#ifdef DEBUG
+tuple->track_name = str_to_utf8(tmp);
-printf("audmad_get_song_tuple: track_name = %s\n", tuple->track_name);
+g_free(tmp);
-printf("audmad_get_song_tuple: stream_name = %s\n", tuple->album_name);
+tmp = NULL;
+}
+tmp = vfs_get_metadata(info.infile, "stream-name");
+if(tmp){
+tuple->album_name = str_to_utf8(tmp);
+g_free(tmp);
+tmp = NULL;
+}
+#ifdef DEBUG
+g_message("audmad_get_song_tuple: track_name = %s", tuple->track_name);
+g_message("audmad_get_song_tuple: stream_name = %s", tuple->album_name);
 #endif
 tuple->file_name = g_path_get_basename(filename);
 tuple->file_path = g_path_get_dirname(filename);
 tuple->file_ext = extname(filename);
 tuple->length = -1;
 tuple->mtime = 0; // this indicates streaming
 #ifdef DEBUG
-printf("get_song_tuple remote: tuple\n");
+g_message("get_song_tuple remote: tuple");
 #endif
 return tuple;
 }
 #ifdef DEBUG
-printf("get_song_tuple: remote: NULL\n");
+g_message("get_song_tuple: remote: NULL");
 #endif
 return NULL;
 }
 if ((file = vfs_fopen(filename, "rb")) != NULL) {
 tuple->length = -1;
 string = input_id3_get_string(tag, "TLEN");
 if (string) {
 tuple->length = atoi(string);
 #ifdef DEBUG
-printf("get_song_tuple: TLEN = %d\n", tuple->length);
+g_message("get_song_tuple: TLEN = %d", tuple->length);
 #endif
 g_free(string);
 string = NULL;
 }
 else {
 #endif
 return tuple;
 }
+// probably this function is nolonger needed.
+#if 0
 /**
 * Retrieve meta-information about URL.
 * For local files this means ID3 tag etc.
 */
 gboolean mad_get_info(struct mad_info_t * info, gboolean fast_scan)
 #ifdef DEBUG
 g_message("e: mad_get_info");
 #endif
 return TRUE;
 }
+#endif
 static gchar *fmts[] = { "mp3", "mp2", "mpg", NULL };
 InputPlugin *get_iplugin_info(void)
 {

Mercurial > audlegacy-plugins

comparison src/madplug/plugin.c @ 768:1d3f70ac6b31 trunk