fix conflict

1 files changed, 4 insertions, 7 deletions

diff --git a/src/libaudcore/internal.h b/src/libaudcore/internal.h
index 9f05c25..534ba69 100644
--- a/src/libaudcore/internal.h
+++ b/src/libaudcore/internal.h
@@ -103,13 +103,6 @@ bool open_input_file (const char * filename, const char * mode,
  InputPlugin * ip, VFSFile & file, String * error = nullptr);
 InputPlugin * load_input_plugin (PluginHandle * decoder, String * error = nullptr);
 
-/* internal versions of aud_file_* functions;
- * these allow reuse of the same file handle during probing */
-PluginHandle * file_find_decoder (const char * filename, bool fast,
- VFSFile & file, String * error = nullptr);
-bool file_read_tag (const char * filename, PluginHandle * decoder,
- VFSFile & file, Tuple * tuple, Index<char> * image, String * error = nullptr);
-
 /* runtime.cc */
 extern size_t misc_bytes_allocated;
 
@@ -128,6 +121,10 @@ bool same_basename (const char * a, const char * b);
 const char * last_path_element (const char * path);
 void cut_path_element (char * path, int pos);
 
+bool is_cuesheet_entry (const char * filename);
+bool is_subtune (const char * filename);
+StringBuf strip_subtune (const char * filename);
+
 unsigned int32_hash (unsigned val);
 unsigned ptr_hash (const void * ptr);