Removed loading of music files from a track directory if the .music

files are not specified in the track.xml file. There is no need to
support this functionality (track directories should only contain
music that is actually used by the track), and it caused duplicated
entries on case-insensitive file systems (e.g. on windows it
resulted in one entry for west.music, and one for West.music).
While the latter had no big disadvantage (it was cleared correctly)
it is unnecessary and might lead to problems later.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9971 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/audio/music_manager.cpp

@@ -109,27 +109,6 @@ void MusicManager::loadMusicInformation()
     }   // for dir
 }   // loadMusicInformation
 
-//-----------------------------------------------------------------------------
-void MusicManager::loadMusicFromOneDir(const std::string& dir)
-{
-    std::set<std::string> files;
-    file_manager->listFiles(files, dir, /*is_full_path*/ true,
-                            /*make_full_path*/ true);
-    for(std::set<std::string>::iterator i = files.begin(); i != files.end(); ++i)
-    {
-        if(StringUtils::getExtension(*i)!="music") continue;
-        try
-        {
-            m_all_music[StringUtils::getBasename(*i)] = new MusicInformation(*i);
-        }
-        catch (std::exception& e)
-        {
-            (void)e;  // avoid compiler warning
-            continue;
-        }
-    }   // for i
-} // loadMusicFromOneDir
-
 //-----------------------------------------------------------------------------
 void MusicManager::addMusicToTracks()
 {

src/audio/music_manager.hpp

@@ -76,7 +76,6 @@ public:
       */ 
     MusicInformation       *getMusicInformation(const std::string& filename);
     
-    void                    loadMusicFromOneDir(const std::string& dir);
     void                    addMusicToTracks();
 
 };

src/tracks/track_manager.cpp

@@ -170,8 +170,6 @@ bool TrackManager::loadTrack(const std::string& dirname)
     m_tracks.push_back(track);
     m_track_avail.push_back(true);
     updateGroups(track);
-    // Read music files in that dir as well
-    music_manager->loadMusicFromOneDir(dirname);
     return true;
 }   // loadTrack