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: Lasse Kärkkäi. <tr...@us...> - 2010-08-12 22:45:07
|
Module: performous
Branch: master
Commit: 90ec6dd54629b5a447ee2154b962cb25d3f303d9
Author: Lasse Karkkainen <tro...@tr...>
Date: Wed Jun 23 08:11:40 2010 +0300
Implement track fading (the current commands structure is a simple hack which is supposed to be improved to support more things in the future).
---
game/audio.cc | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/game/audio.cc b/game/audio.cc
index 7c1779b..4cd5ae4 100644
--- a/game/audio.cc
+++ b/game/audio.cc
@@ -41,8 +41,8 @@ public:
for (size_t i = 0, iend = mixbuf.size(); i != iend; ++i) {
if (i % 2 == 0) {
fadeLevel += fadeRate;
- if (fadeLevel <= 0.0f) return false;
- if (fadeLevel > 1.0f) { fadeLevel = 1.0f; fadeRate = 0.0f; }
+ if (fadeLevel <= 0.0) return false;
+ if (fadeLevel > 1.0) { fadeLevel = 1.0; fadeRate = 0.0; }
}
begin[i] += mixbuf[i] * fadeLevel;
}
@@ -66,6 +66,11 @@ public:
}
return ready;
}
+ void trackLevel(std::string const& id, double level) {
+ Tracks::iterator it = tracks.find(id);
+ if (it == tracks.end()) return;
+ it->second->volume = level;
+ }
};
// rename to Sample once totally implemented
@@ -98,12 +103,15 @@ struct SampleNew {
};
+typedef std::pair<std::string, double> Command; ///< <stream ID, volume level>
+
struct Audio::Impl {
boost::mutex mutex;
std::auto_ptr<Music> preloading;
boost::ptr_vector<Music> playing, disposing;
boost::ptr_map<std::string, SampleNew> samples;
boost::ptr_vector<Analyzer> analyzers;
+ std::vector<Command> commands;
portaudio::Init init;
boost::ptr_vector<portaudio::Stream> streams;
volatile bool paused;
@@ -123,6 +131,13 @@ struct Audio::Impl {
if (!playing.empty()) playing[0].fadeRate = -preloading->fadeRate; // Fade out the old music
playing.insert(playing.begin(), preloading);
}
+ // Process commands
+ for (size_t i = 0; i < commands.size(); ++i) {
+ std::string id = commands[i].first;
+ double level = commands[i].second;
+ if (!playing.empty()) playing[0].trackLevel(id, level);
+ }
+ commands.clear();
}
void callbackInput(float const* begin, float const* end) {
analyzers[0].input(begin, end); // TODO: non-pointer sample iterators and support more analyzers
@@ -199,6 +214,7 @@ void Audio::playMusic(std::map<std::string,std::string> const& filenames, bool p
Music& m = *self->preloading.get();
m.seek(startPos);
m.fadeRate = 1.0 / getSR() / fadeTime;
+ self->commands.clear(); // Remove old unprocessed commands (they should not apply to the new music)
}
void Audio::playMusic(std::string const& filename, bool preview, double fadeTime, double startPos) {
@@ -255,6 +271,8 @@ void Audio::pause(bool state) {
bool Audio::isPaused() const { return self->paused; }
void Audio::streamFade(std::string stream_id, double level) {
+ boost::mutex::scoped_lock l(self->mutex);
+ self->commands.push_back(Command(stream_id, level));
}
boost::ptr_vector<Analyzer>& Audio::analyzers() { return self->analyzers; }
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-08-12 22:45:07
|
Module: performous
Branch: master
Commit: c61af2ba294b143b9bcc25b933740907647f051d
Author: Lasse Karkkainen <tro...@tr...>
Date: Mon Jun 21 22:58:39 2010 +0300
Change Z buffer to 24 bits instead of 16 bits (glattr was not accepting 16 on my Intel/Linux system).
---
game/video_driver.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/game/video_driver.cc b/game/video_driver.cc
index 508db0e..084c103 100644
--- a/game/video_driver.cc
+++ b/game/video_driver.cc
@@ -97,7 +97,7 @@ void Window::resize() {
GLattrSetter attr_b(SDL_GL_BLUE_SIZE, 8);
GLattrSetter attr_a(SDL_GL_ALPHA_SIZE, 8);
GLattrSetter attr_buf(SDL_GL_BUFFER_SIZE, 32);
- GLattrSetter attr_d(SDL_GL_DEPTH_SIZE, 16);
+ GLattrSetter attr_d(SDL_GL_DEPTH_SIZE, 24);
GLattrSetter attr_s(SDL_GL_STENCIL_SIZE, 8);
GLattrSetter attr_db(SDL_GL_DOUBLEBUFFER, 1);
GLattrSetter attr_ar(SDL_GL_ACCUM_RED_SIZE, 0);
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-08-12 22:45:07
|
Module: performous
Branch: master
Commit: 6d10efce3f07f9867852e53fd73257b419f9e1c8
Author: Lasse Karkkainen <tro...@tr...>
Date: Mon Jun 21 08:20:05 2010 +0300
More error handling for song loader (avoiding uncaught exceptions)
---
game/songs.cc | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/game/songs.cc b/game/songs.cc
index 1bdb005..19e802d 100644
--- a/game/songs.cc
+++ b/game/songs.cc
@@ -42,12 +42,16 @@ void Songs::reload_internal() {
Profiler prof("Song loading took");
Paths paths = getPathsConfig("system/path_songs");
for (Paths::iterator it = paths.begin(); m_loading && it != paths.end(); ++it) {
- if (!fs::is_directory(*it)) { m_debug << ">>> Not scanning: " << *it << " (no such directory)" << std::endl; continue; }
- m_debug << ">>> Scanning " << *it << std::endl;
- size_t count = m_songs.size();
- reload_internal(*it);
- size_t diff = m_songs.size() - count;
- if (diff > 0 && m_loading) m_debug << diff << " songs loaded" << std::endl;
+ try {
+ if (!fs::is_directory(*it)) { m_debug << ">>> Not scanning: " << *it << " (no such directory)" << std::endl; continue; }
+ m_debug << ">>> Scanning " << *it << std::endl;
+ size_t count = m_songs.size();
+ reload_internal(*it);
+ size_t diff = m_songs.size() - count;
+ if (diff > 0 && m_loading) m_debug << diff << " songs loaded" << std::endl;
+ } catch (std::exception& e) {
+ m_debug << ">>> Error scanning " << *it << ": " << e.what() << std::endl;
+ }
}
prof("total");
if (m_loading) dumpSongs_internal(); // Dump the songlist to file (if requested)
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-08-12 22:45:07
|
Module: performous Branch: master Commit: 25d5f464dcc3d47a7af7b31f841652cac5b1fcaf Author: Vincent Le Ligeour <yo...@us...> Date: Sun Jun 20 22:04:19 2010 +0200 Implemented sample playback --- game/audio.cc | 61 +++++++++++++++++----------------------------- game/audio.hh | 9 +------ game/guitargraph.cc | 31 +++++++++++++---------- game/guitargraph.hh | 2 +- game/screen_practice.cc | 24 ++++++++++-------- game/screen_practice.hh | 4 +- 6 files changed, 57 insertions(+), 74 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-08-12 22:45:07
|
Module: performous
Branch: master
Commit: 4a0b003f9e520b5bf7ec32b618f51d9a7a54e42e
Author: Lasse Karkkainen <tro...@tr...>
Date: Mon Jun 21 08:19:12 2010 +0300
Do not use the new CMake detection that comes with Boost because it is currently broken.
---
cmake/Modules/FindBoost.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cmake/Modules/FindBoost.cmake b/cmake/Modules/FindBoost.cmake
index 127393d..4ca8778 100644
--- a/cmake/Modules/FindBoost.cmake
+++ b/cmake/Modules/FindBoost.cmake
@@ -78,7 +78,7 @@
# Force proper redetection (to allow e.g. changed COMPONENTS)
set(Boost_FOUND false)
-find_package(Boost QUIET COMPONENTS ${Boost_FIND_COMPONENTS} NO_MODULE)
+#find_package(Boost QUIET COMPONENTS ${Boost_FIND_COMPONENTS} NO_MODULE)
if (Boost_FOUND)
if (Boost_FIND_COMPONENTS)
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-08-12 22:45:02
|
Module: performous
Branch: master
Commit: e9e9e096e2e2982b881f29cfd8fa7c2ee7b0473a
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Jun 19 05:36:08 2010 +0300
More audio cleanup and fixed a bug causing streams with negative starting pos never getting played.
---
game/audio.cc | 15 ++++++++++-----
game/audio.hh | 9 ++++-----
game/ffmpeg.hh | 1 +
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/game/audio.cc b/game/audio.cc
index 7fd5b5f..b82be8d 100644
--- a/game/audio.cc
+++ b/game/audio.cc
@@ -119,16 +119,21 @@ struct Audio::Impl {
Audio::Audio(): self(new Impl) {}
Audio::~Audio() {}
+bool Audio::isOpen() const {
+ boost::mutex::scoped_lock l(self->mutex);
+ return !self->streams.empty();
+}
+
void Audio::play(Sample const& s, std::string const& volumeSetting) {
}
void Audio::playMusic(std::map<std::string,std::string> const& filenames, bool preview, double fadeTime, double startPos) {
boost::mutex::scoped_lock l(self->mutex);
- self->disposing.clear();
- self->preloading.reset(new Music(filenames, 48000));
+ self->disposing.clear(); // Delete disposed streams
+ self->preloading.reset(new Music(filenames, getSR()));
Music& m = *self->preloading.get();
m.seek(startPos);
- m.fadeRate = fadeTime / 48000.0f;
+ m.fadeRate = 1.0 / getSR() / fadeTime;
}
void Audio::playMusic(std::string const& filename, bool preview, double fadeTime, double startPos) {
@@ -149,12 +154,12 @@ void Audio::fadeout(double fadeTime) {
double Audio::getPosition() const {
boost::mutex::scoped_lock l(self->mutex);
- return self->playing.empty() ? getNaN() : self->playing[0].pos();
+ return (self->playing.empty() || self->preloading.get()) ? getNaN() : self->playing[0].pos();
}
double Audio::getLength() const {
boost::mutex::scoped_lock l(self->mutex);
- return self->playing.empty() ? getNaN() : self->playing[0].duration();
+ return (self->playing.empty() || self->preloading.get()) ? getNaN() : self->playing[0].duration();
}
bool Audio::isPlaying() const {
diff --git a/game/audio.hh b/game/audio.hh
index 1585d23..ab310a8 100644
--- a/game/audio.hh
+++ b/game/audio.hh
@@ -23,17 +23,16 @@ public:
Audio();
~Audio();
boost::ptr_vector<Analyzer>& analyzers() { static boost::ptr_vector<Analyzer> ana; return ana; }
- /// if audio is currently playing
- bool isOpen() const { return false; }
+ bool isOpen() const;
/** Play a song beginning at startPos (defaults to 0)
* @param filename the track filename
* @param preview if the song preview is to play
* @param fadeTime time to fade
* @param startPos starting position
*/
- void playMusic(std::string const& filename, bool preview = false, double fadeTime = 0.5, double startPos = -0.2);
+ void playMusic(std::string const& filename, bool preview = false, double fadeTime = 0.5, double startPos = 0.0);
/// plays a list of songs
- void playMusic(std::map<std::string,std::string> const& filenames, bool preview = false, double fadeTime = 0.5, double startPos = -0.2);
+ void playMusic(std::map<std::string,std::string> const& filenames, bool preview = false, double fadeTime = 0.5, double startPos = 0.0);
/// plays a sample
void play(Sample const& s, std::string const& volumeSetting);
/// stops music
@@ -59,6 +58,6 @@ public:
bool isPaused() const;
void toggleSynth(Notes const& notes) { /*m_notes = (m_notes ? NULL : ¬es); */} ///< toggles synth playback
void streamFade(std::string stream_id, double level);
- unsigned int getSR() const { return 48000.0; }
+ double getSR() const { return 48000.0; }
};
diff --git a/game/ffmpeg.hh b/game/ffmpeg.hh
index 8836fde..246f436 100644
--- a/game/ffmpeg.hh
+++ b/game/ffmpeg.hh
@@ -140,6 +140,7 @@ class AudioBuffer {
bool prepare(int64_t pos) {
boost::mutex::scoped_try_lock l(m_mutex);
if (!l.owns_lock()) return false;
+ if (pos < 0) pos = 0;
m_posReq = pos;
return m_pos > m_posReq + m_data.capacity() / 4 && m_pos - m_data.size() <= m_pos;
}
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-08-12 22:44:59
|
Module: performous
Branch: master
Commit: c2f54befed710fc626c5f66d32bc71c440e6f6f2
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Jun 19 04:12:13 2010 +0300
Remove unused Audio::open function
---
game/audio.cc | 3 ---
game/audio.hh | 2 --
2 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/game/audio.cc b/game/audio.cc
index bcffa80..7fd5b5f 100644
--- a/game/audio.cc
+++ b/game/audio.cc
@@ -119,9 +119,6 @@ struct Audio::Impl {
Audio::Audio(): self(new Impl) {}
Audio::~Audio() {}
-void Audio::open(std::string const& pdev, std::size_t rate, std::size_t frames) {
-}
-
void Audio::play(Sample const& s, std::string const& volumeSetting) {
}
diff --git a/game/audio.hh b/game/audio.hh
index bbe5045..1585d23 100644
--- a/game/audio.hh
+++ b/game/audio.hh
@@ -23,8 +23,6 @@ public:
Audio();
~Audio();
boost::ptr_vector<Analyzer>& analyzers() { static boost::ptr_vector<Analyzer> ana; return ana; }
- /** Takes libda devstr and sample rate. Throws if the device fails. **/
- void open(std::string const& pdev, std::size_t rate, std::size_t frames);
/// if audio is currently playing
bool isOpen() const { return false; }
/** Play a song beginning at startPos (defaults to 0)
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-08-12 22:44:57
|
Module: performous
Branch: master
Commit: 65b738ec82f831d249d043f18a9783b4b5f5440e
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Jun 19 04:07:46 2010 +0300
Audio cleanup, fix freezing and implement pause.
---
game/audio.cc | 13 ++++++++++---
game/audio.hh | 16 ++++------------
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/game/audio.cc b/game/audio.cc
index bc45462..bcffa80 100644
--- a/game/audio.cc
+++ b/game/audio.cc
@@ -74,7 +74,8 @@ struct Audio::Impl {
boost::ptr_vector<Music> playing, disposing;
portaudio::Init init;
boost::ptr_vector<portaudio::Stream> streams;
- Impl() {
+ volatile bool paused;
+ Impl(): paused(false) {
std::string dev;
streams.push_back(new portaudio::Stream(*this, portaudio::Params().channelCount(2).device(dev, true), portaudio::Params().channelCount(2).device(dev, false), 48000));
PaError err = Pa_StartStream(streams[0]);
@@ -92,6 +93,7 @@ struct Audio::Impl {
void callbackInput(float const* begin, float const* end) {}
void callbackOutput(float* begin, float* end) {
std::fill(begin, end, 0.0f);
+ if (paused) return;
for (size_t i = 0; i < playing.size();) {
bool keep = playing[i](begin, end);
// Disposing hack
@@ -139,9 +141,13 @@ void Audio::playMusic(std::string const& filename, bool preview, double fadeTime
}
void Audio::stopMusic() {
+ std::map<std::string,std::string> m;
+ playMusic(m, false, 0.0);
}
void Audio::fadeout(double fadeTime) {
+ std::map<std::string,std::string> m;
+ playMusic(m, false, fadeTime);
}
double Audio::getPosition() const {
@@ -176,10 +182,11 @@ void Audio::seekPos(double pos) {
}
void Audio::pause(bool state) {
- boost::mutex::scoped_lock l(self->mutex);
- pause(state);
+ self->paused = state;
}
+bool Audio::isPaused() const { return self->paused; }
+
void Audio::streamFade(std::string stream_id, double level) {
}
diff --git a/game/audio.hh b/game/audio.hh
index 8455836..bbe5045 100644
--- a/game/audio.hh
+++ b/game/audio.hh
@@ -38,8 +38,6 @@ public:
void playMusic(std::map<std::string,std::string> const& filenames, bool preview = false, double fadeTime = 0.5, double startPos = -0.2);
/// plays a sample
void play(Sample const& s, std::string const& volumeSetting);
- /// get pause status
- bool isPaused() { return m_paused; }
/// stops music
void stopMusic();
/// fades music out
@@ -58,17 +56,11 @@ public:
bool isPlaying() const;
/** Get the current position. If not known or nothing is playing, NaN is returned. **/
double getPosition() const;
- void operator()(); ///< Thread runs here, don't call directly
- /// pauses and unpauses playback
- void togglePause() { pause(!m_paused); }
+ void togglePause() { pause(!isPaused()); }
void pause(bool state = true);
- /// toggles synth playback (F4)
- void toggleSynth(Notes const& notes) { m_notes = (m_notes ? NULL : ¬es); }
+ bool isPaused() const;
+ void toggleSynth(Notes const& notes) { /*m_notes = (m_notes ? NULL : ¬es); */} ///< toggles synth playback
void streamFade(std::string stream_id, double level);
- unsigned int getSR() const { return 0; }
-private:
- bool m_paused;
- Notes const* volatile m_notes;
- std::string m_volumeSetting;
+ unsigned int getSR() const { return 48000.0; }
};
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-08-12 22:44:56
|
Module: performous Branch: master Commit: 0d35bcbd489e904ced0216f97fd8e16b646c8f0e Author: Lasse Karkkainen <tro...@tr...> Date: Fri Jun 18 04:20:02 2010 +0300 Merge branch 'master' into portaudio --- |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-08-12 22:44:52
|
Module: performous Branch: master Commit: 946c2c09a98dd899e734360d2a71a6269c70fd5e Author: Lasse Karkkainen <tro...@tr...> Date: Fri Jun 18 01:39:52 2010 +0300 Merge branch 'master' into portaudio Conflicts: game/screen_sing.hh libs/libda/plugins/alsa/alsa.hpp --- |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-08-12 22:44:50
|
Module: performous
Branch: master
Commit: 2a086a48576811bea2b495a908a7348d63050568
Author: Vincent Le Ligeour <yo...@us...>
Date: Sun May 30 13:43:59 2010 +0200
Added few methods to enable simple track play
---
game/audio.cc | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/game/audio.cc b/game/audio.cc
index 66fe695..bc45462 100644
--- a/game/audio.cc
+++ b/game/audio.cc
@@ -145,24 +145,39 @@ void Audio::fadeout(double fadeTime) {
}
double Audio::getPosition() const {
- return 0.0;
+ boost::mutex::scoped_lock l(self->mutex);
+ return self->playing.empty() ? getNaN() : self->playing[0].pos();
}
double Audio::getLength() const {
- return 0.0;
+ boost::mutex::scoped_lock l(self->mutex);
+ return self->playing.empty() ? getNaN() : self->playing[0].duration();
}
bool Audio::isPlaying() const {
- return false;
+ boost::mutex::scoped_lock l(self->mutex);
+ return !self->playing.empty();
}
void Audio::seek(double offset) {
+ boost::mutex::scoped_lock l(self->mutex);
+ for(boost::ptr_vector<Music>::iterator it = self->playing.begin() ; it != self->playing.end() ; ++it) {
+ it->seek(clamp(it->pos() + offset, 0.0, it->duration()));
+ }
+ pause(false);
}
void Audio::seekPos(double pos) {
+ boost::mutex::scoped_lock l(self->mutex);
+ for(boost::ptr_vector<Music>::iterator it = self->playing.begin() ; it != self->playing.end() ; ++it) {
+ it->seek(pos);
+ }
+ pause(false);
}
void Audio::pause(bool state) {
+ boost::mutex::scoped_lock l(self->mutex);
+ pause(state);
}
void Audio::streamFade(std::string stream_id, double level) {
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-08-12 22:44:47
|
Module: performous
Branch: master
Commit: d3d2634a2581e1732bfebaaf9fc5f0344d1a2c76
Author: Vincent Le Ligeour <yo...@us...>
Date: Sun May 30 13:11:14 2010 +0200
Fixed compilation error
---
game/screen_sing.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 003b380..9d3d04b 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -81,7 +81,7 @@ void ScreenSing::enter() {
m_progress.reset(new ProgressBar(getThemePath("sing_progressbg.svg"), getThemePath("sing_progressfg.svg"), ProgressBar::HORIZONTAL, 0.01f, 0.01f, true));
m_progress->dimensions.fixedWidth(0.4).left(-0.5).screenTop();
theme->timer.dimensions.screenTop(0.5 * m_progress->dimensions.h());
- boost::ptr_vector<Analyzer>& analyzers = m_capture.analyzers();
+ boost::ptr_vector<Analyzer>& analyzers = m_audio.analyzers();
m_layout_singer.reset(new LayoutSinger(m_song->vocals, m_database, theme));
// Load instrument and dance tracks
{
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-08-12 22:44:45
|
Module: performous Branch: master Commit: 6fc0a38608954259145f5a3eef66639f7e062e56 Author: Vincent Le Ligeour <yo...@us...> Date: Sun May 30 13:01:32 2010 +0200 Merged and solved conflict from master --- |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-08-12 22:44:43
|
Module: performous Branch: master Commit: 04c09a279de7be78393b151a1b20b7ed7588453b Author: Lasse Karkkainen <tro...@tr...> Date: Sat Feb 27 04:49:54 2010 +0200 Fifth generation audio rewrite: - Removed most libda functionality - Ripped away a lot of things to make Performous compile again - Using PortAudio directly within audio.cc - audio.cc/audio.hh completely redesigned (now with pImpl) - Supports multiple tracks and simple crossfading - Many other things missing - Audio device configuration not implemented, a lot of hardcoded stuff - Displays "no playback devices found" always. (still a long way to go) --- cmake/Modules/FindPortAudio.cmake | 35 ++ cmake/Modules/FindPortaudio.cmake | 35 -- game/CMakeLists.txt | 12 +- game/audio.cc | 227 ++++---- game/audio.hh | 91 +--- game/ffmpeg.hh | 17 +- game/main.cc | 90 +--- game/record.hh | 45 -- game/screen_intro.cc | 4 +- game/screen_intro.hh | 4 +- game/screen_practice.cc | 10 +- game/screen_practice.hh | 5 +- game/screen_sing.cc | 3 +- game/screen_sing.hh | 6 +- libs/CMakeLists.txt | 1 - libs/libda/CMakeLists.txt | 71 --- libs/libda/cmake/CMakeLists.txt | 11 - libs/libda/cmake/LibDAConfig.cmake.in | 10 - libs/libda/cmake/LibDAConfigVersion.cmake.in | 13 - libs/libda/cmake/Modules/FindALSA.cmake | 34 -- libs/libda/cmake/Modules/FindAVCodec.cmake | 48 -- libs/libda/cmake/Modules/FindAVFormat.cmake | 46 -- libs/libda/cmake/Modules/FindAVUtil.cmake | 44 -- libs/libda/cmake/Modules/FindAtk.cmake | 34 -- libs/libda/cmake/Modules/FindAtkmm.cmake | 35 -- libs/libda/cmake/Modules/FindBoost.cmake | 413 -------------- libs/libda/cmake/Modules/FindCairo.cmake | 34 -- libs/libda/cmake/Modules/FindCairomm.cmake | 34 -- libs/libda/cmake/Modules/FindClanLib.cmake | 48 -- libs/libda/cmake/Modules/FindDL.cmake | 23 - libs/libda/cmake/Modules/FindFAAC.cmake | 24 - libs/libda/cmake/Modules/FindFreetype.cmake | 31 - libs/libda/cmake/Modules/FindGDK-PixBuf.cmake | 32 -- libs/libda/cmake/Modules/FindGDK.cmake | 43 -- libs/libda/cmake/Modules/FindGDKmm.cmake | 44 -- libs/libda/cmake/Modules/FindGIO.cmake | 27 - libs/libda/cmake/Modules/FindGIOmm.cmake | 35 -- libs/libda/cmake/Modules/FindGLEW.cmake | 29 - libs/libda/cmake/Modules/FindGLFW.cmake | 38 -- libs/libda/cmake/Modules/FindGObject.cmake | 31 - libs/libda/cmake/Modules/FindGStreamer.cmake | 33 -- libs/libda/cmake/Modules/FindGTK.cmake | 38 -- libs/libda/cmake/Modules/FindGTKmm.cmake | 46 -- libs/libda/cmake/Modules/FindGlib.cmake | 39 -- libs/libda/cmake/Modules/FindGlibmm.cmake | 42 -- libs/libda/cmake/Modules/FindJack.cmake | 28 - libs/libda/cmake/Modules/FindJpeg.cmake | 28 - libs/libda/cmake/Modules/FindLibPulse.cmake | 28 - libs/libda/cmake/Modules/FindLibPulseSimple.cmake | 28 - libs/libda/cmake/Modules/FindLibRSVG.cmake | 35 -- libs/libda/cmake/Modules/FindLibXML++.cmake | 42 -- libs/libda/cmake/Modules/FindLibXML2.cmake | 29 - libs/libda/cmake/Modules/FindMagick++.cmake | 33 -- libs/libda/cmake/Modules/FindMagick.cmake | 38 -- libs/libda/cmake/Modules/FindOpenGL.cmake | 35 -- libs/libda/cmake/Modules/FindPThread.cmake | 21 - libs/libda/cmake/Modules/FindPango.cmake | 36 -- libs/libda/cmake/Modules/FindPangoCairo.cmake | 35 -- libs/libda/cmake/Modules/FindPangomm.cmake | 36 -- libs/libda/cmake/Modules/FindPng.cmake | 28 - libs/libda/cmake/Modules/FindPortMidi.cmake | 21 - libs/libda/cmake/Modules/FindPortaudio.cmake | 35 -- libs/libda/cmake/Modules/FindProjectM.cmake | 30 - libs/libda/cmake/Modules/FindSDL.cmake | 59 -- libs/libda/cmake/Modules/FindSDL_mixer.cmake | 32 -- libs/libda/cmake/Modules/FindSWScale.cmake | 46 -- libs/libda/cmake/Modules/FindSigC++.cmake | 38 -- libs/libda/cmake/Modules/FindTiff.cmake | 28 - libs/libda/cmake/Modules/FindZ.cmake | 28 - libs/libda/cmake/Modules/LibFindMacros.cmake | 76 --- libs/libda/cmake/config.h.in | 11 - libs/libda/cmake/libda-packaging.cmake | 61 -- libs/libda/examples/CMakeLists.txt | 7 - libs/libda/examples/capture.cpp | 71 --- libs/libda/include/libda/audio.hpp | 171 ------ libs/libda/include/libda/audio_dev.hpp | 35 -- .../portaudio.hh => include/libda/portaudio.hpp} | 30 +- libs/libda/plugins/CMakeLists.txt | 170 ------ libs/libda/plugins/alsa/alsa.hpp | 581 -------------------- libs/libda/plugins/audio_dev_alsa.cpp | 260 --------- libs/libda/plugins/audio_dev_gst.cpp | 94 ---- libs/libda/plugins/audio_dev_jack.cpp | 134 ----- libs/libda/plugins/audio_dev_pa18.cpp | 90 --- libs/libda/plugins/audio_dev_pa19.cpp | 78 --- libs/libda/plugins/audio_dev_pulse.cpp | 122 ---- libs/libda/plugins/audio_dev_tone.cpp | 109 ---- libs/libda/src/CMakeLists.txt | 31 - libs/libda/src/audio.cpp | 103 ---- 88 files changed, 222 insertions(+), 4824 deletions(-) |
|
From: Tapio V. <aa...@us...> - 2010-08-12 21:28:31
|
Module: performous Branch: joinmenu Commit: 47fe51cbf64ef3da94b871462e4ff335ef25a04e Author: Tapio Vierros <tap...@gm...> Date: Thu Aug 12 23:53:10 2010 +0300 Merge branch 'master' into joinmenu --- |
|
From: Tapio V. <aa...@us...> - 2010-08-12 21:28:29
|
Module: performous
Branch: joinmenu
Commit: ffd1a78ff9729bd9400e77b99db74fe09acc396d
Author: Tapio Vierros <tap...@gm...>
Date: Thu Aug 12 23:47:36 2010 +0300
Add OpenCV to cross-compilation.
---
cmake/Modules/FindOpenCV.cmake | 41 +++++++++++++++------------
win32/cross-from-debian/makedeps.sh | 51 +++++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+), 18 deletions(-)
diff --git a/cmake/Modules/FindOpenCV.cmake b/cmake/Modules/FindOpenCV.cmake
index 3dec6df..6b745f6 100644
--- a/cmake/Modules/FindOpenCV.cmake
+++ b/cmake/Modules/FindOpenCV.cmake
@@ -30,18 +30,23 @@
# --------------------------------
+#TODO: Clean-up all this shit.
+
MACRO(DBG_MSG _MSG)
-# MESSAGE(STATUS "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}):\n${_MSG}")
+ #MESSAGE(STATUS "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}):\n${_MSG}")
ENDMACRO(DBG_MSG)
+# Use pkg-config to get hints about paths
+libfind_pkg_check_modules(OpenCV_PKGCONF opencv)
+
# required cv components with header and library if COMPONENTS unspecified
IF (NOT OpenCV_FIND_COMPONENTS)
# default
SET(OpenCV_FIND_REQUIRED_COMPONENTS CV CXCORE HIGHGUI)
IF (WIN32)
-LIST(APPEND OpenCV_FIND_REQUIRED_COMPONENTS CVCAM ) # WIN32 only actually
+#LIST(APPEND OpenCV_FIND_REQUIRED_COMPONENTS CVCAM ) # WIN32 only actually
ENDIF(WIN32)
ENDIF (NOT OpenCV_FIND_COMPONENTS)
@@ -73,7 +78,7 @@ LIST(APPEND OpenCV_POSSIBLE_ROOT_DIRS /opt/net/gcc41/OpenCV )
ENDIF(CXX_COMPILER_VERSION MATCHES ".*4\\.[0-9].*")
ENDIF (${CMAKE_COMPILER_IS_GNUCXX})
-#DBG_MSG("DBG (OpenCV_POSSIBLE_ROOT_DIRS=${OpenCV_POSSIBLE_ROOT_DIRS}")
+DBG_MSG("OpenCV_POSSIBLE_ROOT_DIRS=${OpenCV_POSSIBLE_ROOT_DIRS}")
#
# select exactly ONE OpenCV base directory/tree
@@ -109,7 +114,7 @@ lib
OpenCV/lib
otherlibs/_graphics/lib
)
-#DBG_MSG("OpenCV_LIBDIR_SUFFIXES=${OpenCV_LIBDIR_SUFFIXES}")
+DBG_MSG("OpenCV_LIBDIR_SUFFIXES=${OpenCV_LIBDIR_SUFFIXES}")
#
@@ -117,23 +122,23 @@ otherlibs/_graphics/lib
#
FIND_PATH(OpenCV_CV_INCLUDE_DIR
NAMES cv.h
-PATHS ${OpenCV_ROOT_DIR}
+PATHS ${OpenCV_PKGCONF_INCLUDE_DIRS} ${OpenCV_ROOT_DIR}
PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} )
FIND_PATH(OpenCV_CXCORE_INCLUDE_DIR
NAMES cxcore.h
-PATHS ${OpenCV_ROOT_DIR}
+PATHS ${OpenCV_PKGCONF_INCLUDE_DIRS} ${OpenCV_ROOT_DIR}
PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} )
FIND_PATH(OpenCV_CVAUX_INCLUDE_DIR
NAMES cvaux.h
-PATHS ${OpenCV_ROOT_DIR}
+PATHS ${OpenCV_PKGCONF_INCLUDE_DIRS} ${OpenCV_ROOT_DIR}
PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} )
FIND_PATH(OpenCV_HIGHGUI_INCLUDE_DIR
NAMES highgui.h
-PATHS ${OpenCV_ROOT_DIR}
+PATHS ${OpenCV_PKGCONF_INCLUDE_DIRS} ${OpenCV_ROOT_DIR}
PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} )
FIND_PATH(OpenCV_CVCAM_INCLUDE_DIR
NAMES cvcam.h
-PATHS ${OpenCV_ROOT_DIR}
+PATHS ${OpenCV_PKGCONF_INCLUDE_DIRS} ${OpenCV_ROOT_DIR}
PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} )
#
@@ -142,32 +147,32 @@ PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} )
#
FIND_LIBRARY(OpenCV_CV_LIBRARY
NAMES cv opencv
-PATHS ${OpenCV_ROOT_DIR}
+PATHS ${OpenCV_PKGCONF_INCLUDE_DIRS} ${OpenCV_ROOT_DIR}
PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
FIND_LIBRARY(OpenCV_CVAUX_LIBRARY
NAMES cvaux
-PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
+PATHS ${OpenCV_PKGCONF_INCLUDE_DIRS} ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
FIND_LIBRARY(OpenCV_CVCAM_LIBRARY
NAMES cvcam
-PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
+PATHS ${OpenCV_PKGCONF_INCLUDE_DIRS} ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
FIND_LIBRARY(OpenCV_CVHAARTRAINING_LIBRARY
NAMES cvhaartraining
-PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
+PATHS ${OpenCV_PKGCONF_INCLUDE_DIRS} ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
FIND_LIBRARY(OpenCV_CXCORE_LIBRARY
NAMES cxcore
-PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
+PATHS ${OpenCV_PKGCONF_INCLUDE_DIRS} ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
FIND_LIBRARY(OpenCV_CXTS_LIBRARY
NAMES cxts
-PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
+PATHS ${OpenCV_PKGCONF_INCLUDE_DIRS} ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
FIND_LIBRARY(OpenCV_HIGHGUI_LIBRARY
NAMES highgui
-PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
+PATHS ${OpenCV_PKGCONF_INCLUDE_DIRS} ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
FIND_LIBRARY(OpenCV_ML_LIBRARY
NAMES ml
-PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
+PATHS ${OpenCV_PKGCONF_INCLUDE_DIRS} ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
FIND_LIBRARY(OpenCV_TRS_LIBRARY
NAMES trs
-PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
+PATHS ${OpenCV_PKGCONF_INCLUDE_DIRS} ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
diff --git a/win32/cross-from-debian/makedeps.sh b/win32/cross-from-debian/makedeps.sh
index bd54f8e..0dc83db 100755
--- a/win32/cross-from-debian/makedeps.sh
+++ b/win32/cross-from-debian/makedeps.sh
@@ -63,6 +63,7 @@ assert_binary_on_path tar
assert_binary_on_path unzip
assert_binary_on_path wget
+SCRIPTDIR="`pwd`"
export PREFIX="`pwd`"/deps
export WINEPREFIX="`pwd`"/wine
mkdir -pv "$PREFIX"/bin "$PREFIX"/lib "$PREFIX"/include "$PREFIX"/lib/pkgconfig "$PREFIX"/build-stamps
@@ -620,3 +621,53 @@ if test ! -f "$PREFIX"/build-stamps/ffmpeg; then
touch "$PREFIX"/build-stamps/ffmpeg
$RM_RF ffmpeg
fi
+
+# VideoInput
+# This is support library for OpenCV to get video input on Windows.
+# This is only needed if you want OpenCV.
+VIDEOINPUT="videoInput0.1995"
+if test ! -f "$PREFIX"/build-stamps/videoinput; then
+ download http://muonics.net/school/spring05/videoInput/files/$VIDEOINPUT.zip
+ unzip -o $VIDEOINPUT.zip
+ # We don't bother compiling this since it has precompiled lib and would
+ # probably be a pain in the ass.
+ cp -v $VIDEOINPUT/compiledLib/compiledByDevCpp/*.a "$PREFIX"/lib
+ cp -v $VIDEOINPUT/compiledLib/compiledByDevCpp/include/*.h "$PREFIX"/include
+ touch "$PREFIX"/build-stamps/videoinput
+ $RM_RF $VIDEOINPUT
+fi
+
+# OpenCV
+# This is optional and is used to enable webcam features.
+OPENCV="OpenCV-2.1.0"
+if test ! -f "$PREFIX"/build-stamps/opencv; then
+ download http://download.sourceforge.net/opencvlibrary/$OPENCV-win.zip
+ unzip -o $OPENCV-win.zip
+ cd $OPENCV
+ ln -s ../deps/include/videoInput.h /src/highgui/videoinput.h
+ mkdir -pv build
+ cd build
+ cmake \
+ -DCMAKE_TOOLCHAIN_FILE="$SCRIPTDIR/Toolchain.cmake" \
+ -DBUILD_NEW_PYTHON_SUPPORT=OFF \
+ -DBUILD_TESTS=OFF \
+ -DWITH_JASPER=OFF -DWITH_JPEG=OFF -DWITH_PNG=OFF -DWITH_TBB=OFF -DWITH_TIFF=OFF \
+ -DCMAKE_INSTALL_PREFIX="$PREFIX" \
+ ..
+ make
+ make install
+ cp -v unix-install/opencv.pc "$PREFIX"/lib/pkgconfig # No auto-install :(
+ pushd .
+ cd "$PREFIX"/lib
+ # Create some symlinks so the cmake scripts detect it correctly
+ ln -svf libcv210.dll.a libcv.dll.a
+ ln -svf libcxcore210.dll.a libcxcore.dll.a
+ ln -svf libcvaux210.dll.a libcvaux.dll.a
+ ln -svf libhighgui210.dll.a libhighgui.dll.a
+ popd
+ cd ../..
+ touch "$PREFIX"/build-stamps/opencv
+ $RM_RF $OPENCV
+fi
+
+echo "All dependencies done."
|
|
From: Tapio V. <aa...@us...> - 2010-08-12 21:28:27
|
Module: performous
Branch: joinmenu
Commit: e6b6831664bab8770a461622014c3eb85883e13b
Author: Vincent Le Ligeour <yo...@us...>
Date: Thu Aug 12 21:52:00 2010 +0200
Fixed some of mr_bones comments
---
.../games-arcade/performous/performous-9999.ebuild | 23 +++++++-------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/portage-overlay/games-arcade/performous/performous-9999.ebuild b/portage-overlay/games-arcade/performous/performous-9999.ebuild
index 5a412f4..05a3313 100644
--- a/portage-overlay/games-arcade/performous/performous-9999.ebuild
+++ b/portage-overlay/games-arcade/performous/performous-9999.ebuild
@@ -2,12 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /cvsroot/ultrastar-ng/UltraStar-ng/portage-overlay/games-arcade/performous/performous-9999.ebuild,v 1.10 2007/09/29 13:04:19 yoda-jm Exp $
+[[ ${PV} = 9999 ]] && GIT="git"
EAPI=2
-inherit games cmake-utils
-[ "$PV" == "9999" ] && inherit git
-
-RESTRICT="nostrip"
+inherit cmake-utils ${GIT} games
SONGS_PN=ultrastar-songs
@@ -34,9 +32,9 @@ LICENSE="GPL-2
CCPL-Attribution-NonCommercial-NoDerivs-2.5
)"
SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~x86"
-IUSE="debug alsa portaudio pulseaudio jack songs gstreamer tools editor midi webcam"
+IUSE="alsa debug editor gstreamer jack midi portaudio pulseaudio songs tools webcam"
RDEPEND="gnome-base/librsvg
>=dev-libs/boost-1.39.0
@@ -63,22 +61,17 @@ RDEPEND="gnome-base/librsvg
DEPEND="${RDEPEND}
>=dev-util/cmake-2.6.0"
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
src_unpack() {
if [ "${PV}" != "9999" ]; then
unpack "${MY_P}.tar.bz2"
else
git_src_unpack
- cd "${S}"
fi
+ cd "${S}"
if use songs; then
- cd "${S}"
- unpack "${SONGS_PN}-jc-1.zip"
- unpack "${SONGS_PN}-libre-3.zip"
- unpack "${SONGS_PN}-restricted-3.zip"
- unpack "${SONGS_PN}-shearer-1.zip"
- cd "${S}"
+ unpack "${SONGS_PN}-jc-1.zip" "${SONGS_PN}-libre-3.zip" "${SONGS_PN}-restricted-3.zip" "${SONGS_PN}-shearer-1.zip"
fi
}
@@ -114,7 +107,7 @@ src_install() {
mv -f "${D}/${GAMES_PREFIX}/share/man" "${D}/usr/share/"
if use songs; then
- insinto "/usr/share/games/ultrastar"
+ insinto "${GAMES_PREFIX}/share/performous"
doins -r "${S}/songs" || die "doins songs failed"
fi
doicon "${S}/data/${PN}.xpm"
|
|
From: Tapio V. <aa...@us...> - 2010-08-12 21:28:23
|
Module: performous Branch: joinmenu Commit: 2eba654be384a274a1d5a31d5d98f115f2061075 Author: Tapio Vierros <tap...@gm...> Date: Thu Aug 12 20:58:40 2010 +0300 Make cross-compilation dep versions easier to update. --- win32/cross-from-debian/makedeps.sh | 216 +++++++++++++++++++---------------- 1 files changed, 120 insertions(+), 96 deletions(-) |
|
From: Tapio V. <aa...@us...> - 2010-08-12 21:28:21
|
Module: performous Branch: joinmenu Commit: c87c53b1ffdf988d5868d68e86284c4805d5fa90 Author: Tapio Vierros <tap...@gm...> Date: Thu Aug 12 20:48:40 2010 +0300 Make stump's deps cross compilation script pass easier. --- win32/cross-from-debian/makedeps.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/win32/cross-from-debian/makedeps.sh b/win32/cross-from-debian/makedeps.sh index 355a4d2..b0c9360 100755 --- a/win32/cross-from-debian/makedeps.sh +++ b/win32/cross-from-debian/makedeps.sh @@ -392,7 +392,7 @@ if test ! -f "$PREFIX"/build-stamps/atk; then download http://ftp.gnome.org/pub/GNOME/sources/atk/1.30/atk-1.30.0.tar.bz2 tar jxvf atk-1.30.0.tar.bz2 cd atk-1.30.0 - ./configure $COMMON_AUTOCONF_FLAGS + ./configure $COMMON_AUTOCONF_FLAGS --disable-glibtest make make install cd .. @@ -410,7 +410,7 @@ if test ! -f "$PREFIX"/build-stamps/gtk; then download http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.20/gtk+-2.20.1.tar.bz2 tar jxvf gtk+-2.20.1.tar.bz2 cd gtk+-2.20.1 - ./configure $COMMON_AUTOCONF_FLAGS --disable-modules --without-libtiff --with-included-loaders=png,jpeg,gif,xpm,xbm + ./configure $COMMON_AUTOCONF_FLAGS --disable-glibtest --disable-modules --without-libtiff --with-included-loaders=png,jpeg,gif,xpm,xbm make -C gdk-pixbuf wine-shwrap gdk-pixbuf/gdk-pixbuf-csource wine-shwrap gdk-pixbuf/gdk-pixbuf-query-loaders @@ -578,7 +578,7 @@ if test ! -f "$PREFIX"/build-stamps/ffmpeg; then svn up ffmpeg fi cd ffmpeg - ./configure --prefix="$PREFIX" --cc="$CROSS_GCC" --nm="$CROSS_NM" --target-os=mingw32 --arch=i386 --disable-static --enable-shared --enable-gpl --enable-postproc --enable-avfilter-lavf --enable-w32threads --enable-runtime-cpudetect --enable-memalign-hack --enable-zlib --enable-libschroedinger --extra-cflags="-I$PREFIX/include" --extra-ldflags="-L$PREFIX/lib" + ./configure --prefix="$PREFIX" --cc="$CROSS_GCC" --nm="$CROSS_NM" --target-os=mingw32 --arch=i386 --disable-static --enable-shared --enable-gpl --enable-postproc --enable-w32threads --enable-runtime-cpudetect --enable-memalign-hack --enable-zlib --enable-libschroedinger --extra-cflags="-I$PREFIX/include" --extra-ldflags="-L$PREFIX/lib" sed -i -e 's/-Werror=[^ ]*//g' config.mak make make install |
|
From: Tapio V. <aa...@us...> - 2010-08-12 21:28:18
|
Module: performous Branch: joinmenu Commit: 9e507d679258969734ca842e7096a9242e634b76 Author: Tapio Vierros <tap...@gm...> Date: Thu Aug 12 20:44:38 2010 +0300 Add back the old background image - doesn't hurt to have some variance. --- data/backgrounds/classic_bg.svg | 388 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 388 insertions(+), 0 deletions(-) |
|
From: Tapio V. <aa...@us...> - 2010-08-12 21:28:16
|
Module: performous
Branch: joinmenu
Commit: 2142fb5f72ae7bb7538fef8985a56380f04a7ac3
Author: Tapio Vierros <tap...@gm...>
Date: Thu Aug 12 20:39:13 2010 +0300
Clog vs. cout
cout: Data paths are useful since people keep asking about them.
cout: Audio devs are useful and they wouldn't show even in pdevhelp/michelp.
clog: Joystick IDs read from xml are debug info.
---
game/fs.cc | 4 ++--
game/joystick.cc | 12 ++++++------
game/main.cc | 2 +-
game/portmidi.hh | 6 +++---
libs/libda/plugins/audio_dev_alsa.cpp | 10 +++++-----
libs/libda/plugins/audio_dev_pa19.cpp | 6 +++---
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/game/fs.cc b/game/fs.cc
index 2129583..823f78f 100644
--- a/game/fs.cc
+++ b/game/fs.cc
@@ -135,10 +135,10 @@ bool isThemeResource(fs::path filename){
namespace {
bool pathNotExist(fs::path const& p) {
if (exists(p)) {
- std::clog << ">>> Using data path \"" << p.string() << "\"" << std::endl;
+ std::cout << ">>> Using data path \"" << p.string() << "\"" << std::endl;
return false;
}
- std::clog << ">>> Not using \"" << p.string() << "\" (does not exist)" << std::endl;
+ std::cout << ">>> Not using \"" << p.string() << "\" (does not exist)" << std::endl;
return true;
}
}
diff --git a/game/joystick.cc b/game/joystick.cc
index c16ae45..1128fe1 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -234,10 +234,10 @@ namespace {
void readControllers(input::Instruments &instruments, fs::path const& file) {
if (!fs::exists(file)) {
- std::cout << "Skipping " << file << " (not found)" << std::endl;
+ std::clog << "Skipping " << file << " (not found)" << std::endl;
return;
}
- std::cout << "Parsing " << file << std::endl;
+ std::clog << "Parsing " << file << std::endl;
xmlpp::DomParser domParser(file.string());
try {
xmlpp::NodeSet n = domParser.get_document()->get_root_node()->find("/controllers/controller");
@@ -331,7 +331,7 @@ void readControllers(input::Instruments &instruments, fs::path const& file) {
// inserting the instrument
if(instruments.find(name) == instruments.end()) {
- std::cout << " Adding " << type << ": " << name << std::endl;
+ std::clog << " Adding " << type << ": " << name << std::endl;
} else {
std::cout << " Overriding " << type << ": " << name << std::endl;
instruments.erase(name);
@@ -422,9 +422,9 @@ void input::SDL::init() {
// Here we should send an event to have correct state buttons
init_devices();
// Adding keyboard instruments
- std::cout << "Keyboard as guitar controller: " << (config["game/keyboard_guitar"].b() ? "enabled":"disabled") << std::endl;
- std::cout << "Keyboard as drumkit controller: " << (config["game/keyboard_drumkit"].b() ? "enabled":"disabled") << std::endl;
- std::cout << "Keyboard as dance pad controller: " << (config["game/keyboard_dancepad"].b() ? "enabled":"disabled") << std::endl;
+ std::clog << "Keyboard as guitar controller: " << (config["game/keyboard_guitar"].b() ? "enabled":"disabled") << std::endl;
+ std::clog << "Keyboard as drumkit controller: " << (config["game/keyboard_drumkit"].b() ? "enabled":"disabled") << std::endl;
+ std::clog << "Keyboard as dance pad controller: " << (config["game/keyboard_dancepad"].b() ? "enabled":"disabled") << std::endl;
input::SDL::sdl_devices[input::detail::KEYBOARD_ID] = NULL;
input::detail::devices.insert(std::make_pair<unsigned int, input::detail::InputDevPrivate>(input::detail::KEYBOARD_ID, input::detail::InputDevPrivate(g_instruments.find("GUITAR_GUITARHERO")->second)));
input::SDL::sdl_devices[input::detail::KEYBOARD_ID2] = NULL;
diff --git a/game/main.cc b/game/main.cc
index bbc9f4c..242ef2a 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -438,5 +438,5 @@ void outputOptionalFeatureStatus() {
(input::MidiDrums::enabled() ? "Enabled" : "Disabled")
<< std::endl << " Webcam support: " <<
(Webcam::enabled() ? "Enabled" : "Disabled")
- << std::endl;
+ << std::endl << std::endl;
}
diff --git a/game/portmidi.hh b/game/portmidi.hh
index 8e8b1d7..927a31f 100644
--- a/game/portmidi.hh
+++ b/game/portmidi.hh
@@ -12,7 +12,7 @@ namespace pm {
class Stream {
public:
operator PortMidiStream*() { return m_handle; }
-
+
protected:
PortMidiStream* m_handle;
Stream(): m_handle() {}
@@ -27,7 +27,7 @@ namespace pm {
PmDeviceInfo const* info = Pm_GetDeviceInfo(devId);
if (info->input != input) continue;
if (info->opened) continue;
- std::cout << " " << info->name << std::endl;
+ std::cout << " " << info->name << std::endl << std::endl;
}
}
int findDevice(bool input, std::string const& name = "") {
@@ -42,7 +42,7 @@ namespace pm {
throw std::runtime_error("No matching PortMidi device found");
}
}
-
+
class Input: public Stream {
public:
Input(int devId) {
diff --git a/libs/libda/plugins/audio_dev_alsa.cpp b/libs/libda/plugins/audio_dev_alsa.cpp
index b96f7f7..d9d3b47 100644
--- a/libs/libda/plugins/audio_dev_alsa.cpp
+++ b/libs/libda/plugins/audio_dev_alsa.cpp
@@ -29,18 +29,18 @@ namespace {
if (snd_ctl_pcm_info(ctl, pcminfo) < 0) continue;
std::string device = std::string("alsa:hw:") + snd_ctl_card_info_get_id(info) + "," + boost::lexical_cast<std::string>(dev);
std::string desc = std::string(snd_ctl_card_info_get_name(info)) + " (" + snd_pcm_info_get_name(pcminfo) + ")";
- std::clog << " " << device << " " << desc << std::endl;
+ std::cout << " " << device << " " << desc << std::endl;
}
}
}
struct Foo {
Foo() {
- std::clog << "ALSA capture devices:\n";
+ std::cout << "ALSA capture devices:\n";
devices(SND_PCM_STREAM_CAPTURE);
- std::clog << "ALSA playback devices:\n";
+ std::cout << "ALSA playback devices:\n";
devices(SND_PCM_STREAM_PLAYBACK);
- std::clog << std::endl;
+ std::cout << std::endl;
}
} foo;
@@ -95,7 +95,7 @@ namespace {
}
}
*/
-
+
class alsa_record: public record::dev {
settings m_s;
alsa::pcm m_pcm;
diff --git a/libs/libda/plugins/audio_dev_pa19.cpp b/libs/libda/plugins/audio_dev_pa19.cpp
index bf4f6d4..e2b273a 100644
--- a/libs/libda/plugins/audio_dev_pa19.cpp
+++ b/libs/libda/plugins/audio_dev_pa19.cpp
@@ -9,13 +9,13 @@ namespace {
struct Foo {
portaudio::Init init;
Foo() {
- std::clog << "PortAudio devices:\n";
+ std::cout << "PortAudio devices:\n";
for (int i = 0, end = Pa_GetDeviceCount(); i != end; ++i) {
PaDeviceInfo const* info = Pa_GetDeviceInfo(i);
if (!info) continue;
- std::clog << " pa19:" << i << " " << info->name << " (" << info->maxInputChannels << " in, " << info->maxOutputChannels << " out)\n";
+ std::cout << " pa19:" << i << " " << info->name << " (" << info->maxInputChannels << " in, " << info->maxOutputChannels << " out)\n";
}
- std::clog << std::endl;
+ std::cout << std::endl;
}
} foo;
|
|
From: Tapio V. <aa...@us...> - 2010-08-12 21:28:13
|
Module: performous
Branch: joinmenu
Commit: f526acceb1c0322c7694c944441d8b169c1d87b0
Author: Tapio Vierros <tap...@gm...>
Date: Thu Aug 12 20:28:12 2010 +0300
Reduce ffmpeg console spam.
---
game/ffmpeg.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/game/ffmpeg.cc b/game/ffmpeg.cc
index 1f0d80b..5c136f3 100644
--- a/game/ffmpeg.cc
+++ b/game/ffmpeg.cc
@@ -50,7 +50,7 @@ double FFmpeg::duration() const {
void FFmpeg::open() {
boost::mutex::scoped_lock l(s_avcodec_mutex);
av_register_all();
- //av_log_set_level(AV_LOG_DEBUG);
+ av_log_set_level(AV_LOG_ERROR);
if (av_open_input_file(&pFormatCtx, m_filename.c_str(), NULL, 0, NULL)) throw std::runtime_error("Cannot open input file");
if (av_find_stream_info(pFormatCtx) < 0) throw std::runtime_error("Cannot find stream information");
pFormatCtx->flags |= AVFMT_FLAG_GENPTS;
|
|
From: Tapio V. <aa...@us...> - 2010-08-12 21:28:11
|
Module: performous
Branch: joinmenu
Commit: e972792d444fbc33b52565007649b5b4a18d8e60
Author: Vincent Le Ligeour <yo...@us...>
Date: Thu Aug 12 17:56:51 2010 +0200
Fixed Gentoo man page directory
---
.../games-arcade/performous/performous-9999.ebuild | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/portage-overlay/games-arcade/performous/performous-9999.ebuild b/portage-overlay/games-arcade/performous/performous-9999.ebuild
index d2a1ad5..5a412f4 100644
--- a/portage-overlay/games-arcade/performous/performous-9999.ebuild
+++ b/portage-overlay/games-arcade/performous/performous-9999.ebuild
@@ -39,7 +39,7 @@ KEYWORDS="~x86 ~amd64 ~ppc ~ppc64"
IUSE="debug alsa portaudio pulseaudio jack songs gstreamer tools editor midi webcam"
RDEPEND="gnome-base/librsvg
- dev-libs/boost
+ >=dev-libs/boost-1.39.0
x11-libs/pango
dev-cpp/libxmlpp
media-libs/glew
@@ -111,6 +111,7 @@ src_compile() {
src_install() {
DOCS="docs/*.txt" cmake-utils_src_install
+ mv -f "${D}/${GAMES_PREFIX}/share/man" "${D}/usr/share/"
if use songs; then
insinto "/usr/share/games/ultrastar"
|
|
From: Tapio V. <aa...@us...> - 2010-08-12 21:28:08
|
Module: performous
Branch: joinmenu
Commit: 9bb3628203fba4ed746b9c40bc158391fed70477
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Aug 11 21:18:54 2010 +0200
Fixed controllers overriding (yes I'll copy 50 times "I'll read the STL documentation when I use it"
---
game/joystick.cc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/game/joystick.cc b/game/joystick.cc
index d52b85c..c16ae45 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -334,6 +334,7 @@ void readControllers(input::Instruments &instruments, fs::path const& file) {
std::cout << " Adding " << type << ": " << name << std::endl;
} else {
std::cout << " Overriding " << type << ": " << name << std::endl;
+ instruments.erase(name);
}
input::Instrument instrument(name, devType, mapping);
instrument.match = regexp;
|
|
From: Tapio V. <aa...@us...> - 2010-08-12 21:28:06
|
Module: performous
Branch: joinmenu
Commit: 32ec6f0ee64db2932996f7487a7417d06aeb6bae
Author: Tapio Vierros <tap...@gm...>
Date: Wed Aug 11 20:56:18 2010 +0300
Fix loading of other than theme SVGs.
---
game/fs.cc | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/game/fs.cc b/game/fs.cc
index 3a3dea5..2129583 100644
--- a/game/fs.cc
+++ b/game/fs.cc
@@ -126,7 +126,10 @@ std::string getThemePath(std::string const& filename) {
}
bool isThemeResource(fs::path filename){
- return filename == getThemePath(filename.filename());
+ try {
+ std::string themefile = getThemePath(filename.filename());
+ return themefile == filename;
+ } catch (...) { return false; }
}
namespace {
|
