comparison src/flacng/plugin.c @ 1978:fa9f85cebade

s/vfs_/aud_vfs_/g
author William Pitcock <nenolod@atheme.org>
date Sun, 07 Oct 2007 00:25:33 -0500
parents e8ea3a76a84e
children 839804c3b3a4
comparison
equal deleted inserted replaced
1977:5a6b60ceaa0f 1978:fa9f85cebade
39 .pause = flac_pause, 39 .pause = flac_pause,
40 .seek = flac_seek, 40 .seek = flac_seek,
41 .get_song_info = flac_get_song_info, 41 .get_song_info = flac_get_song_info,
42 .get_song_tuple = flac_get_song_tuple, // get a tuple 42 .get_song_tuple = flac_get_song_tuple, // get a tuple
43 .is_our_file_from_vfs = flac_is_our_fd, // version of is_our_file which is handed an FD 43 .is_our_file_from_vfs = flac_is_our_fd, // version of is_our_file which is handed an FD
44 .vfs_extensions = flac_fmts // vector of fileextensions allowed by the plugin 44 .aud_vfs_extensions = flac_fmts // vector of fileextensions allowed by the plugin
45 }; 45 };
46 46
47 InputPlugin *flac_iplist[] = { &flac_ip, NULL }; 47 InputPlugin *flac_iplist[] = { &flac_ip, NULL };
48 48
49 DECLARE_PLUGIN(flacng, NULL, NULL, flac_iplist, NULL, NULL, NULL, NULL, NULL); 49 DECLARE_PLUGIN(flacng, NULL, NULL, flac_iplist, NULL, NULL, NULL, NULL, NULL);
230 230
231 _DEBUG("Testing file: %s", filename); 231 _DEBUG("Testing file: %s", filename);
232 /* 232 /*
233 * Open the file 233 * Open the file
234 */ 234 */
235 if (NULL == (fd = vfs_fopen(filename, "rb"))) { 235 if (NULL == (fd = aud_vfs_fopen(filename, "rb"))) {
236 _ERROR("Could not open file for reading! (%s)", filename); 236 _ERROR("Could not open file for reading! (%s)", filename);
237 _LEAVE FALSE; 237 _LEAVE FALSE;
238 } 238 }
239 239
240 ret = flac_is_our_fd(filename, fd); 240 ret = flac_is_our_fd(filename, fd);
241 241
242 vfs_fclose(fd); 242 aud_vfs_fclose(fd);
243 243
244 _LEAVE ret; 244 _LEAVE ret;
245 } 245 }
246 246
247 /* --- */ 247 /* --- */
534 } 534 }
535 535
536 /* 536 /*
537 * Open the file 537 * Open the file
538 */ 538 */
539 if (NULL == (fd = vfs_fopen(input->filename, "rb"))) { 539 if (NULL == (fd = aud_vfs_fopen(input->filename, "rb"))) {
540 _ERROR("Could not open file for reading! (%s)", input->filename); 540 _ERROR("Could not open file for reading! (%s)", input->filename);
541 _LEAVE; 541 _LEAVE;
542 } 542 }
543 543
544 if (FALSE == read_metadata(fd, main_decoder, main_info)) { 544 if (FALSE == read_metadata(fd, main_decoder, main_info)) {
631 631
632 _DEBUG("Testing file: %s", filename); 632 _DEBUG("Testing file: %s", filename);
633 /* 633 /*
634 * Open the file 634 * Open the file
635 */ 635 */
636 if (NULL == (fd = vfs_fopen(filename, "rb"))) { 636 if (NULL == (fd = aud_vfs_fopen(filename, "rb"))) {
637 _ERROR("Could not open file for reading! (%s)", filename); 637 _ERROR("Could not open file for reading! (%s)", filename);
638 _LEAVE; 638 _LEAVE;
639 } 639 }
640 640
641 INFO_LOCK(test_info); 641 INFO_LOCK(test_info);
680 680
681 _DEBUG("Testing file: %s", filename); 681 _DEBUG("Testing file: %s", filename);
682 /* 682 /*
683 * Open the file 683 * Open the file
684 */ 684 */
685 if (NULL == (fd = vfs_fopen(filename, "rb"))) { 685 if (NULL == (fd = aud_vfs_fopen(filename, "rb"))) {
686 _ERROR("Could not open file for reading! (%s)", filename); 686 _ERROR("Could not open file for reading! (%s)", filename);
687 _LEAVE NULL; 687 _LEAVE NULL;
688 } 688 }
689 689
690 INFO_LOCK(test_info); 690 INFO_LOCK(test_info);