Menu
▾
▴
performous-commit — SCM commits
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(25) |
Jul
(288) |
Aug
(119) |
Sep
(31) |
Oct
(59) |
Nov
(458) |
Dec
(359) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(268) |
Feb
(26) |
Mar
(36) |
Apr
(48) |
May
(119) |
Jun
(37) |
Jul
(173) |
Aug
(429) |
Sep
(137) |
Oct
(156) |
Nov
(59) |
Dec
(45) |
| 2011 |
Jan
(398) |
Feb
(257) |
Mar
(49) |
Apr
(5) |
May
(34) |
Jun
(11) |
Jul
(38) |
Aug
(12) |
Sep
(1) |
Oct
(49) |
Nov
(5) |
Dec
(10) |
| 2012 |
Jan
(21) |
Feb
(32) |
Mar
(20) |
Apr
(1) |
May
(2) |
Jun
|
Jul
(173) |
Aug
|
Sep
(25) |
Oct
(6) |
Nov
(44) |
Dec
|
|
From: Fredrik K. <sci...@us...> - 2010-10-07 15:08:53
|
Module: performous Branch: master Commit: f45615bca4b4910f54389989136b81afccb4e661 Author: Fredrik Klasson <sci...@gm...> Date: Thu Oct 7 17:08:25 2010 +0200 [ ] A little more work on the japanese translation. --- lang/ja.po | 308 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 152 insertions(+), 156 deletions(-) |
|
From: Fredrik K. <sci...@us...> - 2010-10-07 12:52:49
|
Module: performous Branch: master Commit: 48698d1b25ad88cb2e3c1b00679654d3c776b3b4 Author: Fredrik Klasson <sci...@gm...> Date: Thu Oct 7 14:52:24 2010 +0200 [ ] Updating swedish translation. --- lang/sv.po | 171 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 86 insertions(+), 85 deletions(-) |
|
From: Yoda-JM <yo...@us...> - 2010-10-04 19:32:59
|
Module: performous Branch: master Commit: 8d5502adb5d2e7c6f18e663a3021bed3c6c21aae Author: Vincent Le Ligeour <yo...@us...> Date: Mon Oct 4 21:31:41 2010 +0200 Added GH Warriors of Rock guitar mappind/detection --- data/controllers.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/controllers.xml b/data/controllers.xml index 2ab5258..513fcdf 100644 --- a/data/controllers.xml +++ b/data/controllers.xml @@ -15,8 +15,8 @@ </mapping> </controller> <controller type="guitar" name="GUITAR_GUITARHERO5"> - <description>Guitar Hero 5/Band Hero guitar</description> - <regexp match="Entertainment Guitar Hero5" /> + <description>Guitar Hero 5/Band Hero/Warriors of Rock guitar</description> + <regexp match="Entertainment Guitar Hero5|GuitarHero for Playstation" /> <mapping> <button id="0" value="yellow" /> <button id="1" value="green" /> |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 10:02:26
|
Module: performous
Branch: ssxml
Commit: 84ec4684a0b09a227cb8140eb2073101b1162458
Author: Lasse Karkkainen <tro...@tr...>
Date: Tue Sep 28 13:02:13 2010 +0300
Make ffmpeg overwrite any existing mkv file
---
tools/ss_extract.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/ss_extract.cpp b/tools/ss_extract.cpp
index 43ba7cc..38385ad 100644
--- a/tools/ss_extract.cpp
+++ b/tools/ss_extract.cpp
@@ -212,7 +212,7 @@ struct Process {
if (mkvcompress && !song.video.empty()) {
std::cerr << ">>> Recompressing video into H.264 mkv" << std::endl;
fs::path compressed = path / "video.mkv";
- std::string cmd = "ffmpeg -i \"" + song.video.string() + "\" -vcodec libx264 -vpre hq -crf 25 \"" + compressed.string() + "\"";
+ std::string cmd = "ffmpeg -y -i \"" + song.video.string() + "\" -vcodec libx264 -vpre hq -crf 25 \"" + compressed.string() + "\"";
std::cerr << cmd << std::endl;
if (std::system(cmd.c_str()) == 0) { // FIXME: std::system return value is not portable
fs::remove(song.video);
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:52:37
|
Module: performous
Branch: ssxml
Commit: cf4c583dd5d9d559cc4b612aedc95ddd76ab3fbd
Author: Lasse Karkkainen <tro...@tr...>
Date: Tue Sep 28 12:39:19 2010 +0300
-Fixed uppercased "Notes (Singer).txt" (should be "notes (Singer).txt" like "notes.txt" and "notes.xml")
-Fixed and enabled mkv/H.264 compression (not tested on systems with no H.264 support)
-Improved Vorbis quality (was q=3 around 100 kbit/s, now q=5 around 160 kbit/s)
-Prettyprinting filenames now removes question marks rather than substituting with underscores
---
tools/ss_extract.cpp | 21 +++++++++++----------
tools/ss_helpers.hh | 12 ++++++++----
2 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/tools/ss_extract.cpp b/tools/ss_extract.cpp
index dd5162b..43ba7cc 100644
--- a/tools/ss_extract.cpp
+++ b/tools/ss_extract.cpp
@@ -38,7 +38,7 @@ std::ofstream txtfile;
int ts = 0;
int sleepts = -1;
const bool video = true;
-const bool mkvcompress = false;
+const bool mkvcompress = true;
const bool oggcompress = true;
void parseNote(xmlpp::Node* node) {
@@ -91,7 +91,7 @@ void saveTxtFile(xmlpp::NodeSet &sentence, const fs::path &path, const Song &son
file_path = path / "notes.txt";
} else {
file_path = path;
- file_path /= safename(std::string("notes") + " (" + singer + ")" + ".txt");
+ file_path /= "notes (" + safename(singer) + ").txt";
}
txtfile.open(file_path.string().c_str());
if( singer.empty() )
@@ -175,7 +175,7 @@ struct Process {
if (oggcompress) {
if( !song.music.empty() ) {
std::cerr << ">>> Compressing audio into music.ogg" << std::endl;
- std::string cmd = "oggenc \"" + song.music.string() + "\"";
+ std::string cmd = "oggenc -q 5 \"" + song.music.string() + "\"";
std::cerr << cmd << std::endl;
if (std::system(cmd.c_str()) == 0) { // FIXME: std::system return value is not portable
fs::remove(song.music);
@@ -184,7 +184,7 @@ struct Process {
}
if( !song.vocals.empty() ) {
std::cerr << ">>> Compressing audio into vocals.ogg" << std::endl;
- std::string cmd = "oggenc \"" + song.vocals.string() + "\"";
+ std::string cmd = "oggenc -q 5 \"" + song.vocals.string() + "\"";
std::cerr << cmd << std::endl;
if (std::system(cmd.c_str()) == 0) { // FIXME: std::system return value is not portable
fs::remove(song.vocals);
@@ -206,16 +206,17 @@ struct Process {
video_us(song, dataPak[id + "/mus+vid.iav"], dataPak[id + "/mus+vid.ind"], path);
} catch (std::exception& e) {
std::cerr << "!!! Unable to extract video: " << e.what() << std::endl;
- song.video = "";
+ song.video.clear();
}
}
- if (mkvcompress) {
- std::cerr << ">>> Compressing video and audio into music.mkv" << std::endl;
- std::string cmd = "ffmpeg -i \"" + (path / "video.mpg").string() + "\" -vcodec libx264 -vpre hq -crf 25 -threads 0 -metadata album=\"" + song.edition + "\" -metadata author=\"" + song.artist + "\" -metadata comment=\"" + song.genre + "\" -metadata title=\"" + song.title + "\" \"" + (path / "video.m4v\"").string();
+ if (mkvcompress && !song.video.empty()) {
+ std::cerr << ">>> Recompressing video into H.264 mkv" << std::endl;
+ fs::path compressed = path / "video.mkv";
+ std::string cmd = "ffmpeg -i \"" + song.video.string() + "\" -vcodec libx264 -vpre hq -crf 25 \"" + compressed.string() + "\"";
std::cerr << cmd << std::endl;
if (std::system(cmd.c_str()) == 0) { // FIXME: std::system return value is not portable
- fs::remove(path / "video.mpg");
- song.video = path / "video.m4v";
+ fs::remove(song.video);
+ song.video = compressed;
}
}
}
diff --git a/tools/ss_helpers.hh b/tools/ss_helpers.hh
index df447db..ece69cf 100644
--- a/tools/ss_helpers.hh
+++ b/tools/ss_helpers.hh
@@ -89,16 +89,20 @@ Glib::ustring normalize(Glib::ustring const& str) {
/** Sanitize a string into a form that can be safely used as a filename. **/
std::string safename(Glib::ustring const& str) {
Glib::ustring ret;
- Glib::ustring forbidden("\"*/:;<>?\\^`|~");
+ Glib::ustring forbidden("\"*/:;<>\\^`|~"); // Does not include those that have special handling
for (Glib::ustring::const_iterator it = str.begin(); it != str.end(); ++it) {
- bool first = it == str.begin();
+ bool first = (it == str.begin());
+ // Remove various dangerous characters
if (*it < 0x20) continue; // Control characters
if (*it >= 0x7F && *it < 0xA0) continue; // Additional control characters
- if (first && *it == '.') continue;
- if (first && *it == '-') continue;
+ if (first && *it == '.') continue; // Initial '.': a hidden file on UNIX
+ if (first && *it == '-') continue; // Initial '-': looks like a program option
+ // Replace forbidden punctuation with something prettier
+ if (*it == '?') continue;
if (*it == '&') { ret += " and "; continue; }
if (*it == '%') { ret += " percent "; continue; }
if (*it == '$') { ret += " dollar "; continue; }
+ // Replace any other punctuation with underscores
if (forbidden.find(*it) != Glib::ustring::npos) { ret += "_"; continue; }
ret += *it;
}
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:52:34
|
Module: performous Branch: menuvideo Commit: 2d798b23d0ddf8024f8032ba8830455781a6f1b6 Author: Lasse Karkkainen <tro...@tr...> Date: Sat Sep 25 10:51:50 2010 +0300 Merge branch 'master' into menuvideo --- |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:52:31
|
Module: performous Branch: menuvideo Commit: 536fea845586a58f5185f1b73b2ffdaf170cf10e Author: Vincent Le Ligeour <yo...@us...> Date: Fri Sep 24 21:58:56 2010 +0200 Renamed ColorRIIA class --- game/dancegraph.cc | 12 ++++++------ game/glutil.hh | 30 ++++++------------------------ game/guitargraph.cc | 38 +++++++++++++++++++------------------- game/instrumentgraph.cc | 8 ++++---- game/instrumentgraph.hh | 2 +- game/layout_singer.cc | 4 ++-- game/notegraph.cc | 8 ++++---- game/opengl_text.cc | 2 +- game/screen_audiodevices.cc | 2 +- game/screen_players.cc | 2 +- game/screen_sing.cc | 6 +++--- game/screen_songs.cc | 12 ++++++------ game/screenmanager.cc | 2 +- game/video.cc | 2 +- 14 files changed, 56 insertions(+), 74 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:52:28
|
Module: performous Branch: menuvideo Commit: eb9cea7f8d7fa84d1f1369aa0c98531a242a96e8 Author: Vincent Le Ligeour <yo...@us...> Date: Fri Sep 24 21:52:48 2010 +0200 Used OpenGL color RIIA --- game/dancegraph.cc | 38 ++++++---- game/database.hh | 4 +- game/glutil.hh | 16 ++--- game/guitargraph.cc | 164 +++++++++++++++++++++++++----------------- game/guitargraph.hh | 6 +- game/instrumentgraph.cc | 36 +++++---- game/instrumentgraph.hh | 8 +- game/layout_singer.cc | 15 +++-- game/notegraph.cc | 15 ++-- game/opengl_text.cc | 11 ++- game/screen_audiodevices.cc | 13 ++-- game/screen_audiodevices.hh | 2 +- game/screen_players.cc | 8 ++- game/screen_sing.cc | 18 ++--- game/screen_songs.cc | 18 +++--- game/screenmanager.cc | 3 +- game/video.cc | 13 +++- 17 files changed, 220 insertions(+), 168 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:52:24
|
Module: performous Branch: menuvideo Commit: 3af5e403c4b62b0195a7a00ed901715f2aa0e679 Author: Vincent Le Ligeour <yo...@us...> Date: Fri Sep 24 20:34:22 2010 +0200 Prepared for RAII OpenGL Color --- game/dancegraph.cc | 16 ++++++++-------- game/glutil.hh | 31 +++++++++++++++++++++++++++++++ game/guitargraph.cc | 42 +++++++++++++++++++++--------------------- game/instrumentgraph.cc | 8 ++++---- game/instrumentgraph.hh | 2 +- game/layout_singer.cc | 6 +++--- game/notegraph.cc | 14 +++++++------- game/opengl_text.cc | 6 +++--- game/screen_audiodevices.cc | 4 ++-- game/screen_players.cc | 4 ++-- game/screen_sing.cc | 11 +++++------ game/screen_songs.cc | 16 ++++++++-------- game/screenmanager.cc | 4 ++-- game/video.cc | 4 ++-- 14 files changed, 99 insertions(+), 69 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:52:22
|
Module: performous Branch: menuvideo Commit: aad1ea97b878ac80178e94366abb6510b8e73fb5 Author: Fredrik Klasson <sci...@gm...> Date: Wed Sep 22 18:59:45 2010 +0200 [ ] On closer examination, suffixing isn't required as -L/--language bypasses the filename based language guessing of xgettext. --- tools/scripts/xml_gettext.sh | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/scripts/xml_gettext.sh b/tools/scripts/xml_gettext.sh index dc8b678..d9176ed 100755 --- a/tools/scripts/xml_gettext.sh +++ b/tools/scripts/xml_gettext.sh @@ -98,8 +98,9 @@ shift shift # create the temporary file securely. -TEMP_SRC=$(mktemp --tmpdir xml2gettext.XXXXXXXXXX).c -append_temp_src "/* This is a automatically generated temp file, it's safe to remove*/" +TEMP_SRC="$(mktemp --tmpdir xml2gettext.XXXXXXXXXX)" + +append_temp_src "/* This is a automatically generated temp file, it's safe to remove */" # Start the dirty work for file in $* ; do @@ -107,7 +108,7 @@ for file in $* ; do done # Invoke xgettext, poedit will merge this with the rest of the strings -xgettext --force-po -L C -o "$POEDIT_FILE" --from-code="$ENC" -k_ "$TEMP_SRC" +xgettext --force-po --language=C -o "$POEDIT_FILE" --from-code="$ENC" -k_ "$TEMP_SRC" RV=$? # clean up |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:52:19
|
Module: performous Branch: menuvideo Commit: 7b4af9deb4c51d74fd8c9c8e52fb38277ea34876 Author: Fredrik Klasson <sci...@gm...> Date: Wed Sep 22 18:56:44 2010 +0200 [ ] Small typo in translation. --- lang/sv.po | 432 ++++++++++++++++++++++++++++------------------------------- 1 files changed, 205 insertions(+), 227 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:52:15
|
Module: performous Branch: menuvideo Commit: daf359cec1d9fa778666cf221e8d048f5204f0e4 Author: Lasse Karkkainen <tro...@tr...> Date: Wed Sep 22 05:03:04 2010 +0300 Remove unused outdated files --- game/unused/fftgraph.hh | 46 ------------ game/unused/folderview.cpp | 138 ----------------------------------- game/unused/hiscore.cc | 171 -------------------------------------------- game/unused/hiscore.hh | 102 -------------------------- tools/faac.hh | 82 --------------------- 5 files changed, 0 insertions(+), 539 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:52:14
|
Module: performous
Branch: menuvideo
Commit: 520741fd6f17b2aa477e9ef971ee502223556fe9
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Sep 19 17:47:12 2010 +0300
Fix mixup with music/vocals filenames.
---
tools/ss_extract.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/ss_extract.cpp b/tools/ss_extract.cpp
index 6fb5ae7..dd5162b 100644
--- a/tools/ss_extract.cpp
+++ b/tools/ss_extract.cpp
@@ -188,7 +188,7 @@ struct Process {
std::cerr << cmd << std::endl;
if (std::system(cmd.c_str()) == 0) { // FIXME: std::system return value is not portable
fs::remove(song.vocals);
- song.music = path / ("vocals.ogg");
+ song.vocals = path / ("vocals.ogg");
}
}
}
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:52:08
|
Module: performous Branch: menuvideo Commit: bf2ceb69ee98710a48962ad40cdc63ec968a2968 Author: Lasse Karkkainen <tro...@tr...> Date: Sun Sep 19 08:49:44 2010 +0300 Massive ss_extract cleanup. --- tools/ss_extract.cpp | 172 +++++++++++++++++-------------------------------- tools/ss_helpers.hh | 68 ++++++++++++++++---- 2 files changed, 115 insertions(+), 125 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:52:04
|
Module: performous
Branch: menuvideo
Commit: 15bb93132a6a6ceae152fdb06e78edcda55b5ecc
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Sep 18 05:24:11 2010 +0300
Add a tool for extracting 'Disney Sing It' archive files
---
tools/CMakeLists.txt | 4 ++
tools/archive_extract.cpp | 123 +++++++++++++++++++++++++++++++++++++++++++++
tools/pak.cpp | 2 +-
3 files changed, 128 insertions(+), 1 deletions(-)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index f59285d..1d2bbfd 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -54,6 +54,10 @@ if (Boost_FOUND)
target_link_libraries(ss_pak_extract ${Boost_LIBRARIES})
set(targets ${targets} ss_pak_extract)
+ add_executable(ss_archive_extract archive_extract.cpp)
+ target_link_libraries(ss_archive_extract ${Boost_LIBRARIES})
+ set(targets ${targets} ss_archive_extract)
+
if (Z_FOUND)
add_executable(itg_pck itg_pck.cc)
target_link_libraries(itg_pck ${Boost_LIBRARIES} ${Z_LIBRARIES})
diff --git a/tools/archive_extract.cpp b/tools/archive_extract.cpp
new file mode 100644
index 0000000..1d6e412
--- /dev/null
+++ b/tools/archive_extract.cpp
@@ -0,0 +1,123 @@
+// @file Tool for extracting 'Disney Sing It' archive/archive.log files
+
+#include <boost/filesystem.hpp>
+#include <algorithm>
+#include <cstring>
+#include <fstream>
+#include <functional>
+#include <iomanip>
+#include <iostream>
+#include <iterator>
+#include <map>
+#include <sstream>
+#include <stdexcept>
+
+namespace {
+ void usage(char const* progname) {
+ std::cerr << "Usage: " << progname << " archive --extract [files]" << std::endl;
+ std::cerr << " " << progname << " archive --dump file" << std::endl;
+ std::cerr << " " << progname << " archive --list" << std::endl;
+ }
+
+ struct File {
+ size_t offset;
+ size_t size;
+ };
+
+ typedef std::map<std::string, File> Files;
+
+ Files readFiles(std::string archive) {
+ Files files;
+ archive += ".log";
+ std::ifstream archlog(archive.c_str(), std::ios::binary);
+ File f = { 4, 0 };
+ for (std::string name; archlog >> name >> f.size; f.offset += f.size) files[name] = f;
+ if (!archlog.eof()) throw std::runtime_error("Error reading " + archive);
+ return files;
+ }
+
+ void extract(std::ifstream& arch, Files::const_iterator it, std::ostream& output) {
+ File const& f = it->second;
+ std::vector<char> buf(f.size);
+ arch.seekg(f.offset);
+ arch.read(&buf[0], buf.size());
+ output.write(&buf[0], buf.size());
+ }
+
+ struct Extract {
+ Extract(std::ifstream& arch, Files const& files): m_arch(arch), m_files(files) {}
+ /// Extract one file
+ void operator()(std::string const& filename) {
+ Files::const_iterator it = m_files.find(filename);
+ if (it == m_files.end()) throw std::runtime_error("File not found in archive");
+ operator()(it);
+ }
+ /// Extract all files
+ void operator()() {
+ for (Files::const_iterator it = m_files.begin(); it != m_files.end(); ++it) operator()(it);
+ }
+ /// Extract one file by iterator
+ void operator()(Files::const_iterator it) {
+ std::string filename = it->first;
+ // Remove path elements from m_path until it matches the filename's beginning
+ while (m_path != filename.substr(0, m_path.size())) {
+ std::string::size_type pos = m_path.rfind('/');
+ if (pos == std::string::npos) m_path.clear();
+ else m_path.erase(pos);
+ }
+ // Try to create new folders as required
+ for (std::string::size_type pos; (pos = filename.find('/', m_path.size() + 1)) != std::string::npos;) {
+ m_path = filename.substr(0, pos);
+ boost::filesystem::create_directory(m_path);
+ }
+ // Extract the file
+ std::ofstream f(filename.c_str(), std::ios::binary);
+ if (!f.is_open()) throw std::runtime_error("Unable to create file: " + filename);
+ std::cout << filename << std::flush;
+ extract(m_arch, it, f);
+ std::cout << std::endl;
+ }
+ private:
+ std::ifstream& m_arch;
+ Files const& m_files;
+ std::string m_path;
+ };
+
+ std::ostream& operator<<(std::ostream& os, Files const& files) {
+ std::stringstream ss;
+ ss << std::setbase(16) << std::setfill('0');
+ for (Files::const_iterator it = files.begin(); it != files.end(); ++it) {
+ File const& f = it->second;
+ ss << "0x" << std::setw(8) << f.offset << ' ';
+ ss << "0x" << std::setw(8) << f.size << ' ';
+ ss << it->first << std::endl;
+ }
+ return os << ss.rdbuf() << std::flush;
+ }
+}
+
+int main(int argc, char** argv) {
+ std::ios::sync_with_stdio(false);
+ if( argc < 3 ) { usage(argv[0]); return EXIT_FAILURE; }
+ try {
+ std::ifstream arch(argv[1], std::ios::binary);
+ if (!arch) throw std::runtime_error("Unable to open " + std::string(argv[1]));
+ Files const files = readFiles(argv[1]);
+ if (files.empty()) throw std::runtime_error("No files found in archive");
+ if (!strcmp(argv[2],"--list")) std::cout << files;
+ else if (!strcmp(argv[2],"--dump")) {
+ if (argc != 4) { usage(argv[0]); return EXIT_FAILURE; }
+ Files::const_iterator it = files.find(argv[3]);
+ if (it == files.end()) throw std::runtime_error("File not found in archive");
+ extract(arch, it, std::cout);
+ } else if (!strcmp(argv[2],"--extract")) {
+ Extract extractor(arch, files);
+ if (argc == 3) extractor();
+ else std::for_each(argv + 3, argv + argc, extractor);
+ } else { usage(argv[0]); return EXIT_FAILURE; }
+ } catch (std::exception& e) {
+ std::cerr << "Error: " << e.what() << std::endl;
+ return EXIT_FAILURE;
+ }
+}
+
diff --git a/tools/pak.cpp b/tools/pak.cpp
index eeb3b5d..6d1c79b 100644
--- a/tools/pak.cpp
+++ b/tools/pak.cpp
@@ -30,7 +30,7 @@ namespace {
Pak::Pak(std::string const& filename) {
std::ifstream f(filename.c_str(), std::ios::binary);
- if (!f.is_open()) throw std::runtime_error("Could not open PAK file");
+ if (!f.is_open()) throw std::runtime_error("Could not open PAK file " + filename);
f.exceptions(std::ios::failbit);
bool enable_crc;
{
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:51:59
|
Module: performous
Branch: menuvideo
Commit: 3cc848ac8e570e82d1437ab2698c528a7169ec20
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Sep 18 05:23:28 2010 +0300
Add SingStar SuomiHitit name transformation
---
tools/ss_helpers.hh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/tools/ss_helpers.hh b/tools/ss_helpers.hh
index 278f33e..d521f1a 100644
--- a/tools/ss_helpers.hh
+++ b/tools/ss_helpers.hh
@@ -33,6 +33,7 @@ Glib::ustring prettyEdition(Glib::ustring str) {
if (str == "SingStar '80s") return "SingStar 80s";
if (str == "SingStar Schlager") return "SingStar Svenska Hits Schlager";
if (str == "SingStar Suomi Rock") return "SingStar SuomiRock";
+ if (str == "SS SuomiHitit") return "SingStar SuomiHitit";
return str;
}
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:51:55
|
Module: performous Branch: menuvideo Commit: a6bf0d1c9622d072300b98dd851ba6f61d6c74e4 Author: Lasse Karkkainen <tro...@tr...> Date: Tue Aug 31 19:22:51 2010 +0300 Break parts of ss_extract.cc into separete headers + cleanup. --- tools/ss_binary.hh | 176 ++++++++++++++++++++++++ tools/ss_extract.cpp | 362 +++++++------------------------------------------- tools/ss_helpers.hh | 76 +++++++++++ 3 files changed, 300 insertions(+), 314 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:51:51
|
Module: performous Branch: menuvideo Commit: 53bef298d8cd0d5ce8d9ed65c8ace35adcdb59c3 Author: Anders Jenbo <an...@je...> Date: Tue Sep 21 22:55:12 2010 +0200 Update translations to latest POT to help translators that dosn't set up xml paring or update (credits retained) --- lang/de.po | 579 ++++++++++++++++++++++++++++++++++------------------- lang/es.po | 570 +++++++++++++++++++++++++++++++++------------------- lang/fr.po | 653 +++++++++++++++++++++++++++++++----------------------------- lang/hu.po | 557 +++++++++++++++++++++++++++++++++------------------- lang/it.po | 568 +++++++++++++++++++++++++++++++++------------------- lang/nl.po | 557 +++++++++++++++++++++++++++++++++------------------- lang/sv.po | 476 +++++++++++++++++++++++--------------------- 7 files changed, 2399 insertions(+), 1561 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:51:46
|
Module: performous Branch: menuvideo Commit: bb90e854f0bc85eda40913a8f0850c2f139a1594 Author: Anders Jenbo <an...@je...> Date: Tue Sep 21 22:43:34 2010 +0200 Merge branch 'master' of git.performous.org:/gitroot/performous/performous --- |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:51:43
|
Module: performous Branch: menuvideo Commit: 26e788cceafa69510f0de6e148d0014edd0bae5c Author: Anders Jenbo <an...@je...> Date: Tue Sep 21 22:33:36 2010 +0200 Added initial Danish translation --- lang/da.po | 828 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 828 insertions(+), 0 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:51:40
|
Module: performous Branch: menuvideo Commit: fc14d16207943535fbc118e900ed0cb1a16d0892 Author: Anders Jenbo <an...@je...> Date: Tue Sep 21 22:32:29 2010 +0200 make mktemp command compatible with older versions --- tools/scripts/xml_gettext.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/scripts/xml_gettext.sh b/tools/scripts/xml_gettext.sh index 012ac8a..dc8b678 100755 --- a/tools/scripts/xml_gettext.sh +++ b/tools/scripts/xml_gettext.sh @@ -98,7 +98,7 @@ shift shift # create the temporary file securely. -TEMP_SRC=$(mktemp --tmpdir xml2gettext.XXXXXXXXXX.c) +TEMP_SRC=$(mktemp --tmpdir xml2gettext.XXXXXXXXXX).c append_temp_src "/* This is a automatically generated temp file, it's safe to remove*/" # Start the dirty work @@ -113,4 +113,4 @@ RV=$? # clean up rm "$TEMP_SRC" -exit $RV \ No newline at end of file +exit $RV |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:51:29
|
Module: performous
Branch: menuvideo
Commit: e451ba3c7d6a18114699c5c36486bbe14b9c6842
Author: Tapio Vierros <tap...@gm...>
Date: Tue Sep 21 23:20:34 2010 +0300
Pressing any key after 'ready' but before t=0 brings back instrument join menu.
This is to make it easy to recover from accidental 'readiness'.
---
game/guitargraph.cc | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index bb77221..cf88be0 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -323,11 +323,19 @@ void GuitarGraph::engine() {
// Sync menu items & captions
updateJoinMenu();
break;
+
+ // If the songs hasn't yet started, we want key presses to bring join menu back (not pause menu)
+ } else if (time < 0 && ev.type == input::Event::PRESS) {
+ setupJoinMenu();
+ m_menu.open();
+ break;
+
} else if (!m_input.isKeyboard()) {
// Handle Start/Select keypresses
if (ev.nav == input::CANCEL) ev.button = input::GODMODE_BUTTON; // Select = GodMode
if (ev.nav == input::START) { m_menu.open(); continue; }
}
+
// Guitar specific actions
if (!m_drums) {
if ((ev.type == input::Event::PRESS || ev.type == input::Event::RELEASE) && ev.button == input::GODMODE_BUTTON) {
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:51:24
|
Module: performous
Branch: menuvideo
Commit: 457e6e91c7a376caa72e0e744967968f89d53a9c
Author: Tapio Vierros <tap...@gm...>
Date: Tue Sep 21 23:07:44 2010 +0300
Short comment bg in config menu now has adaptive width (was wrong with i18n).
---
game/screen_intro.cc | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index d4f46ae..bbf919c 100644
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -59,6 +59,7 @@ void ScreenIntro::manageEvent(SDL_Event event) {
}
void ScreenIntro::draw_menu_options() {
+ // Variables used for positioning and other stuff
double wcounter = 0;
const size_t showopts = 4; // Show at most 4 options simultaneously
const float x = -0.35;
@@ -71,9 +72,13 @@ void ScreenIntro::draw_menu_options() {
int start_i = std::min((int)m_menu.curIndex() - 1, (int)opts.size() - (int)showopts
+ (m_menu.getSubmenuLevel() == 2 ? 1 : 0)); // Hack to counter side-effects from displaying the value inside the menu
if (start_i < 0 || opts.size() == showopts) start_i = 0;
+
+ // Loop the currently visible options
for (size_t i = start_i, ii = 0; ii < showopts && i < opts.size(); ++i, ++ii) {
MenuOption const& opt = opts[i];
- if (i == m_menu.curIndex()) { // Selection
+
+ // Selection
+ if (i == m_menu.curIndex()) {
// Animate selection higlight moving
double selanim = m_selAnim.get() - start_i;
if (selanim < 0) selanim = 0;
@@ -89,7 +94,9 @@ void ScreenIntro::draw_menu_options() {
theme->option_selected.dimensions.left(x + sel_margin).center(-0.1 + (selanim+1)*0.08);
theme->option_selected.draw("< " + opt.value->getValue() + " >", submenuanim);
}
- } else { // Regular option (not selected)
+
+ // Regular option (not selected)
+ } else {
theme->option.dimensions.left(x).center(start_y + ii*0.08);
theme->option.draw(opt.getName(), submenuanim * (opt.isActive() ? 1.0f : 0.5f));
wcounter = std::max(wcounter, theme->option.w() + 2 * sel_margin); // Calculate the widest entry
@@ -108,8 +115,8 @@ void ScreenIntro::draw() {
theme->comment.draw(m_menu.current().getComment());
// Key help for config
if (m_menu.getSubmenuLevel() > 0) {
- theme->short_comment_bg.dimensions.fixedHeight(0.025);
- theme->short_comment_bg.dimensions.right(-0.04).screenBottom(-0.054);
+ theme->short_comment_bg.dimensions.stretch(theme->short_comment.w() + 0.08, 0.025);
+ theme->short_comment_bg.dimensions.left(-0.54).screenBottom(-0.054);
theme->short_comment_bg.draw();
theme->short_comment.dimensions.left(-0.48).screenBottom(-0.067);
theme->short_comment.draw(_("Ctrl + S to save, Ctrl + R to reset defaults"));
@@ -128,7 +135,7 @@ void ScreenIntro::populateMenu() {
MenuOptions audiomenu;
MenuOptions gfxmenu;
MenuOptions gamemenu;
- MenuOptions pathsmenu; // Dummy
+ MenuOptions pathsmenu; // FIXME: Dummy (just to get a gray option to the menu)
// Populate the submenus
for (Config::iterator it = config.begin(); it != config.end(); ++it) {
// Skip items that are configured elsewhere
@@ -146,6 +153,7 @@ void ScreenIntro::populateMenu() {
configmain.push_back(MenuOption(_("Audio"), _("Configure general audio settings"), audiomenu, "intro_configure.svg"));
configmain.push_back(MenuOption(_("Graphics"), _("Configure rendering and video settings"), gfxmenu, "intro_configure.svg"));
configmain.push_back(MenuOption(_("Game"), _("Gameplay related options"), gamemenu, "intro_configure.svg"));
+ // FIXME: 'Paths' should open a screen
configmain.push_back(MenuOption(_("Paths"), _("Setup song and data paths"), pathsmenu, "intro_configure.svg"));
configmain.back().image.reset(new Surface(getThemePath("intro_quit.svg")));
// Add to root menu
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:51:21
|
Module: performous Branch: menuvideo Commit: c51de888fbae6fba84d969a6237644b937ac476c Author: Vincent Le Ligeour <yo...@us...> Date: Tue Sep 21 00:41:56 2010 +0200 Started French translation update --- lang/fr.po | 709 +++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 418 insertions(+), 291 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-09-28 09:51:16
|
Module: performous Branch: menuvideo Commit: 477a2663e090bd7b858013b4ccda5b31de6680e6 Author: Fredrik Klasson <sci...@gm...> Date: Mon Sep 20 22:35:52 2010 +0200 [ ] Basically finishing the swedish trans. 98% done (only 2 strings not translated) --- lang/sv.po | 199 ++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 107 insertions(+), 92 deletions(-) |
