# HG changeset patch # User Matti Hamalainen # Date 1190160654 -10800 # Node ID 68312d3b39a81fe6b3364afb7c845cc0608a80ca # Parent e60cfd9e3d485cf93b6b13637be3baf211060765 Remove xs_is_our_file() diff -r e60cfd9e3d48 -r 68312d3b39a8 src/sid/xmms-sid.c --- a/src/sid/xmms-sid.c Wed Sep 19 01:03:24 2007 +0200 +++ b/src/sid/xmms-sid.c Wed Sep 19 03:10:54 2007 +0300 @@ -256,25 +256,6 @@ /* * Check whether the given file is handled by this plugin */ -gint xs_is_our_file(gchar *pcFilename) -{ - gint result = 0; - t_xs_file *f; - assert(xs_status.sidPlayer); - - /* Check the filename */ - if (pcFilename == NULL) - return 0; - - if ((f = xs_fopen(pcFilename, "rb")) != NULL) { - if (xs_status.sidPlayer->plrProbe(f)) - result = 1; - xs_fclose(f); - } - - return result; -} - static gchar * xs_has_tracknumber(gchar *pcFilename) { gchar *tmpSep = xs_strrchr(pcFilename, '?'); @@ -684,6 +665,7 @@ tuple_associate_string(pResult, FIELD_FORMATTER, NULL, xs_cfg.titleFormat); } + Tuple * xs_get_song_tuple(gchar *songFilename) { Tuple *tmpResult; @@ -715,6 +697,7 @@ return tmpResult; } + Tuple *xs_probe_for_tuple(gchar *filename, t_xs_file *fd) { if (!xs_is_our_file_vfs(filename, fd)) diff -r e60cfd9e3d48 -r 68312d3b39a8 src/sid/xmms-sid.h --- a/src/sid/xmms-sid.h Wed Sep 19 01:03:24 2007 +0200 +++ b/src/sid/xmms-sid.h Wed Sep 19 03:10:54 2007 +0300 @@ -170,7 +170,6 @@ void xs_init(void); void xs_reinit(void); void xs_close(void); -gint xs_is_our_file(gchar *); gint xs_is_our_file_vfs(gchar *, t_xs_file *); void xs_play_file(InputPlayback *); void xs_stop(InputPlayback *); diff -r e60cfd9e3d48 -r 68312d3b39a8 src/sid/xs_init.c --- a/src/sid/xs_init.c Wed Sep 19 01:03:24 2007 +0200 +++ b/src/sid/xs_init.c Wed Sep 19 03:10:54 2007 +0300 @@ -43,7 +43,6 @@ .file_info_box = xs_fileinfo, /* Show file-information dialog */ .get_song_tuple = xs_get_song_tuple, /* Get Tuple */ - .is_our_file = xs_is_our_file, /* Check file */ .is_our_file_from_vfs = xs_is_our_file_vfs, /* VFS */ .vfs_extensions = xs_sid_fmts, /* File ext assist */ .probe_for_tuple = xs_probe_for_tuple