projects / packages / performous.git / blame
| Commit | Line | Data |
|---|---|---|
| b74c6e04 JR |
1 | --- Performous-0.6.1-Source/game/xtime.hh~ 2010-10-31 17:05:43.000000000 +0100 |
| 2 | +++ Performous-0.6.1-Source/game/xtime.hh 2012-07-11 23:32:18.102217244 +0200 | |
| 3 | @@ -20,7 +20,7 @@ | |
| 4 | } | |
| 5 | boost::xtime now() { | |
| 6 | boost::xtime time; | |
| 7 | - boost::xtime_get(&time, boost::TIME_UTC); | |
| 8 | + boost::xtime_get(&time, boost::TIME_UTC_); | |
| 9 | return time; | |
| 10 | } | |
| 11 | double seconds(boost::xtime const& time) { | |
| 12 | --- Performous-0.6.1-Source/game/backgrounds.cc.orig 2012-07-11 23:39:56.532201074 +0200 | |
| 13 | +++ Performous-0.6.1-Source/game/backgrounds.cc 2012-07-11 23:41:57.872196793 +0200 | |
| 14 | @@ -55,8 +55,8 @@ | |
| 15 | for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { | |
| 16 | fs::path p = dirIt->path(); | |
| 17 | if (fs::is_directory(p)) { reload_internal(p); continue; } | |
| 18 | - std::string name = p.leaf(); // File basename | |
| 19 | - std::string path = p.directory_string(); // Path without filename | |
| 20 | + std::string name = p.filename().string(); // File basename | |
| 21 | + std::string path = p.string(); // Path without filename | |
| 22 | path.erase(path.size() - name.size()); | |
| 23 | if (!regex_match(name.c_str(), match, expression)) continue; | |
| 24 | { | |
| 25 | --- Performous-0.6.1-Source/game/filemagic.hh.orig 2010-10-31 17:05:43.000000000 +0100 | |
| 26 | +++ Performous-0.6.1-Source/game/filemagic.hh 2012-07-12 00:03:24.689391875 +0200 | |
| 27 | @@ -71,7 +71,7 @@ | |
| 28 | // For now, just check the extension an assume it's not lying. | |
| 29 | ||
| 30 | // Get file extension in lower case | |
| 31 | - std::string ext = filename.extension(); | |
| 32 | + std::string ext = filename.extension().string(); | |
| 33 | // somehow this does not convert the extension to lower case: | |
| 34 | //std::for_each(ext.begin(), ext.end(), static_cast<int(*)(int)>(std::tolower)); | |
| 35 | std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower ); | |
| 36 | --- Performous-0.6.1-Source/game/songs.cc.orig 2012-07-12 00:11:59.302707053 +0200 | |
| 37 | +++ Performous-0.6.1-Source/game/songs.cc 2012-07-12 00:12:34.382705813 +0200 | |
| 38 | @@ -67,8 +67,8 @@ | |
| 39 | for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { | |
| 40 | fs::path p = dirIt->path(); | |
| 41 | if (fs::is_directory(p)) { reload_internal(p); continue; } | |
| 42 | - std::string name = p.leaf(); // File basename (notes.txt) | |
| 43 | - std::string path = p.directory_string(); // Path without filename | |
| 44 | + std::string name = p.filename().string(); // File basename (notes.txt) | |
| 45 | + std::string path = p.string(); // Path without filename | |
| 46 | path.erase(path.size() - name.size()); | |
| 47 | if (!regex_match(name.c_str(), match, expression)) continue; | |
| 48 | try { | |
| 49 | --- Performous-0.6.1-Source/game/cache.cc~ 2010-10-31 17:05:43.000000000 +0100 | |
| 50 | +++ Performous-0.6.1-Source/game/cache.cc 2012-07-12 00:14:28.226035127 +0200 | |
| 51 | @@ -9,7 +9,7 @@ | |
| 52 | fs::path constructSVGCacheFileName(fs::path const& svgfilename, double factor){ | |
| 53 | fs::path cache_filename; | |
| 54 | std::string const lod = (boost::format("%.2f") % factor).str(); | |
| 55 | - std::string const cache_basename = svgfilename.filename() + ".cache_" + lod + ".png"; | |
| 56 | + std::string const cache_basename = svgfilename.filename().string() + ".cache_" + lod + ".png"; | |
| 57 | ||
| 58 | if (isThemeResource(svgfilename)) { | |
| 59 | std::string const theme_name = (config["game/theme"].s().empty() ? "default" : config["game/theme"].s()); | |
| 60 | --- Performous-0.6.1-Source/game/songparser-ini.cc~ 2010-10-31 17:05:43.000000000 +0100 | |
| 61 | +++ Performous-0.6.1-Source/game/songparser-ini.cc 2012-07-12 00:15:52.466032156 +0200 | |
| 62 | @@ -94,7 +94,7 @@ | |
| 63 | // Search the dir for the music files | |
| 64 | for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { | |
| 65 | boost::filesystem::path p = dirIt->path(); | |
| 66 | - std::string name = p.leaf(); // File basename (notes.txt) | |
| 67 | + std::string name = p.filename().string(); // File basename (notes.txt) | |
| 68 | if (regex_match(name.c_str(), match, midifile)) { | |
| 69 | s.midifilename = name; | |
| 70 | } else if (regex_match(name.c_str(), match, audiofile_background)) { | |
| 71 | --- Performous-0.6.1-Source/game/fs.cc~ 2010-10-31 17:05:43.000000000 +0100 | |
| 72 | +++ Performous-0.6.1-Source/game/fs.cc 2012-07-12 00:16:42.242697067 +0200 | |
| 73 | @@ -127,7 +127,7 @@ | |
| 74 | ||
| 75 | bool isThemeResource(fs::path filename){ | |
| 76 | try { | |
| 77 | - std::string themefile = getThemePath(filename.filename()); | |
| 78 | + std::string themefile = getThemePath(filename.filename().string()); | |
| 79 | return themefile == filename; | |
| 80 | } catch (...) { return false; } | |
| 81 | } | |
| 82 | --- Performous-0.6.1-Source/game/songparser.cc~ 2010-10-31 17:05:43.000000000 +0100 | |
| 83 | +++ Performous-0.6.1-Source/game/songparser.cc 2012-07-12 00:17:20.302695724 +0200 | |
| 84 | @@ -101,7 +101,7 @@ | |
| 85 | ||
| 86 | for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { | |
| 87 | boost::filesystem::path p = dirIt->path(); | |
| 88 | - std::string name = p.leaf(); // File basename | |
| 89 | + std::string name = p.filename().string(); // File basename | |
| 90 | if (m_song.cover.empty() && regex_match(name.c_str(), match, coverfile)) { | |
| 91 | m_song.cover = name; | |
| 92 | } else if (m_song.background.empty() && regex_match(name.c_str(), match, backgroundfile)) { |