aboutsummaryrefslogtreecommitdiffstats
path: root/src/base/songloading/songloader.cpp
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2010-01-15 05:10:30 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2013-01-05 17:17:44 +0100
commitf5d2afb357c7581536da91022986872cd41b68d3 (patch)
tree2422faa56d75827d265223248832df611974a45b /src/base/songloading/songloader.cpp
parent750505e136531c44d0c6530562509eacfb1e3e56 (diff)
downloadusdx-f5d2afb357c7581536da91022986872cd41b68d3.tar.gz
usdx-f5d2afb357c7581536da91022986872cd41b68d3.tar.xz
usdx-f5d2afb357c7581536da91022986872cd41b68d3.zip
added txt header loading with test and some preparations for loading notes
Diffstat (limited to 'src/base/songloading/songloader.cpp')
-rw-r--r--src/base/songloading/songloader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/base/songloading/songloader.cpp b/src/base/songloading/songloader.cpp
index c4d1054d..8bffa607 100644
--- a/src/base/songloading/songloader.cpp
+++ b/src/base/songloading/songloader.cpp
@@ -56,7 +56,7 @@ namespace usdx
return instance;
}
- Song *Songloader::load(std::string filename)
+ Song *Songloader::load_header(std::string filename)
{
std::string extension = "";
@@ -71,6 +71,6 @@ namespace usdx
throw "Unknown file format.";
}
- return it->second->loadSong(filename);
+ return it->second->load_header(filename);
}
};