comparison src/adplug/adplug-xmms.cc @ 1978:fa9f85cebade

s/vfs_/aud_vfs_/g
author William Pitcock <nenolod@atheme.org>
date Sun, 07 Oct 2007 00:25:33 -0500
parents 5fa26178eaef
children 489e32a8e106
comparison
equal deleted inserted replaced
1977:5a6b60ceaa0f 1978:fa9f85cebade
92 0, 0, 0, 0, -1, "", NULL, 0.0f, false, 0, NULL, NULL}; 92 0, 0, 0, 0, -1, "", NULL, 0.0f, false, 0, NULL, NULL};
93 93
94 static InputPlayback *playback; 94 static InputPlayback *playback;
95 95
96 // XXX: this function is not in the public API yet. 96 // XXX: this function is not in the public API yet.
97 extern "C" VFSFile * vfs_buffered_file_new_from_uri (gchar * uri); 97 extern "C" VFSFile * aud_vfs_buffered_file_new_from_uri (gchar * uri);
98 98
99 /***** Debugging *****/ 99 /***** Debugging *****/
100 100
101 #ifdef DEBUG 101 #ifdef DEBUG
102 102
506 506
507 static void 507 static void
508 adplug_info_box (char *filename) 508 adplug_info_box (char *filename)
509 { 509 {
510 CSilentopl tmpopl; 510 CSilentopl tmpopl;
511 VFSFile *fd = vfs_buffered_file_new_from_uri (filename); 511 VFSFile *fd = aud_vfs_buffered_file_new_from_uri (filename);
512 512
513 if (!fd) 513 if (!fd)
514 return; 514 return;
515 515
516 CPlayer *p = (strcmp (filename, plr.filename) || !plr.p) ? 516 CPlayer *p = (strcmp (filename, plr.filename) || !plr.p) ?
679 679
680 static Tuple* 680 static Tuple*
681 adplug_get_tuple (char *filename) 681 adplug_get_tuple (char *filename)
682 { 682 {
683 CSilentopl tmpopl; 683 CSilentopl tmpopl;
684 VFSFile *fd = vfs_buffered_file_new_from_uri (filename); 684 VFSFile *fd = aud_vfs_buffered_file_new_from_uri (filename);
685 685
686 if (!fd) 686 if (!fd)
687 return NULL; 687 return NULL;
688 688
689 CPlayer *p = factory (fd, &tmpopl); 689 CPlayer *p = factory (fd, &tmpopl);
758 unsigned long freq = cfg.freq; 758 unsigned long freq = cfg.freq;
759 759
760 // we use VfsBufferedFile class here because adplug does a lot of 760 // we use VfsBufferedFile class here because adplug does a lot of
761 // probing. a short delay before probing begins is better than 761 // probing. a short delay before probing begins is better than
762 // a lot of delay during probing. 762 // a lot of delay during probing.
763 VFSFile *fd = vfs_buffered_file_new_from_uri (playback->filename); 763 VFSFile *fd = aud_vfs_buffered_file_new_from_uri (playback->filename);
764 764
765 if (!fd) 765 if (!fd)
766 { 766 {
767 plr.playing = false; 767 plr.playing = false;
768 return (NULL); 768 return (NULL);
886 plr.songtitle = NULL; 886 plr.songtitle = NULL;
887 } 887 }
888 free (sndbuf); 888 free (sndbuf);
889 plr.playing = false; // important! XMMS won't get a self-ended song without it. 889 plr.playing = false; // important! XMMS won't get a self-ended song without it.
890 dbg_printf (".\n"); 890 dbg_printf (".\n");
891 vfs_fclose (fd); 891 aud_vfs_fclose (fd);
892 return (NULL); 892 return (NULL);
893 } 893 }
894 894
895 // sampsize macro not useful anymore. 895 // sampsize macro not useful anymore.
896 #undef sampsize 896 #undef sampsize
919 919
920 static int 920 static int
921 adplug_is_our_file (char *filename) 921 adplug_is_our_file (char *filename)
922 { 922 {
923 CSilentopl tmpopl; 923 CSilentopl tmpopl;
924 VFSFile *fd = vfs_buffered_file_new_from_uri (filename); 924 VFSFile *fd = aud_vfs_buffered_file_new_from_uri (filename);
925 if (!fd) 925 if (!fd)
926 return FALSE; 926 return FALSE;
927 927
928 CPlayer *p = factory (fd, &tmpopl); 928 CPlayer *p = factory (fd, &tmpopl);
929 929