comparison src/mpg123/mpg123.c @ 223:12346b051297 trunk

[svn] - fix tuple breakage
author nenolod
date Sun, 05 Nov 2006 12:36:34 -0800
parents eda9699e490e
children 6a512dedcfbe
comparison
equal deleted inserted replaced
222:eda9699e490e 223:12346b051297
347 static int 347 static int
348 is_our_file(char *filename) 348 is_our_file(char *filename)
349 { 349 {
350 gchar *ext = strrchr(filename, '.'); 350 gchar *ext = strrchr(filename, '.');
351 351
352 if ((!strncasecmp(filename, "http://", 7) 352 if (CHECK_STREAM_URI(filename) &&
353 #ifdef HAVE_NEMESI
354 || !strncasecmp(filename, "rtsp://", 7)
355 #endif
356 ) &&
357 (ext && strncasecmp(ext, ".ogg", 4)) && 353 (ext && strncasecmp(ext, ".ogg", 4)) &&
358 (ext && strncasecmp(ext, ".flac", 5))) 354 (ext && strncasecmp(ext, ".flac", 5)))
359 return TRUE; 355 return TRUE;
360 else if (mpgdec_detect_by_content(filename)) 356 else if (mpgdec_detect_by_content(filename))
361 return TRUE; 357 return TRUE;
628 (*title_real) = NULL; 624 (*title_real) = NULL;
629 625
630 /* 626 /*
631 * TODO: Getting song info from http streams. 627 * TODO: Getting song info from http streams.
632 */ 628 */
633 if (CHECK_STREAM(filename)) 629 if (CHECK_STREAM_URI(filename))
634 return; 630 return;
635 631
636 if ((tuple = get_song_tuple(filename)) != NULL) { 632 if ((tuple = get_song_tuple(filename)) != NULL) {
637 (*len_real) = tuple->length; 633 (*len_real) = tuple->length;
638 (*title_real) = get_song_title(tuple); 634 (*title_real) = get_song_title(tuple);
766 mpgdec_frequency = (gint) m; 762 mpgdec_frequency = (gint) m;
767 } 763 }
768 764
769 mpgdec_length = mpgdec_info->num_frames * mpgdec_info->tpf * 1000; 765 mpgdec_length = mpgdec_info->num_frames * mpgdec_info->tpf * 1000;
770 766
771 if (mpgdec_info->filesize == 0) { 767 if (mpgdec_info->filesize != 0) {
772 TitleInput *tuple = NULL; 768 TitleInput *tuple = NULL;
773 if (!mpgdec_title) 769 if (!mpgdec_title)
774 { 770 {
775 tuple = get_song_tuple(filename); 771 tuple = get_song_tuple(filename);
776 mpgdec_title = get_song_title(tuple); 772 mpgdec_title = get_song_title(tuple);