Menu
▾
▴
[Performous-commit] Lasse Karkkainen : Update all plugins for the new callback interface.
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-07-25 02:50:32
|
Module: performous
Branch: master
Commit: 1c20692c7dc8a8acdd86ec26a060d4ca6b80fc99
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Jul 25 05:50:02 2009 +0300
Update all plugins for the new callback interface.
---
libs/libda/plugins/audio_dev_gst.cpp | 4 ++--
libs/libda/plugins/audio_dev_jack.cpp | 8 ++++----
libs/libda/plugins/audio_dev_pa18.cpp | 8 ++++----
libs/libda/plugins/audio_dev_pa19.cpp | 8 ++++----
libs/libda/plugins/audio_dev_pulse.cpp | 8 ++++----
libs/libda/plugins/audio_dev_tone.cpp | 4 ++--
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/libs/libda/plugins/audio_dev_gst.cpp b/libs/libda/plugins/audio_dev_gst.cpp
index 8af08fd..4dfc084 100644
--- a/libs/libda/plugins/audio_dev_gst.cpp
+++ b/libs/libda/plugins/audio_dev_gst.cpp
@@ -16,8 +16,8 @@ namespace {
std::vector<sample_t> buf(GST_BUFFER_SIZE(buffer)/sizeof(int16_t));
std::transform(iptr, iptr + buf.size(), buf.begin(), conv_from_s16);
std::size_t channels = self.s.channels();
- pcm_data data(&buf[0], (GST_BUFFER_SIZE(buffer) /sizeof(int16_t)) / channels, channels);
- self.s.callback()(data, self.s);
+ pcm_data data(&buf[0], (GST_BUFFER_SIZE(buffer) /sizeof(int16_t)) / channels, channels, self.s.rate());
+ self.s.callback()(data);
} catch (std::exception& e) {
self.s.debug(std::string("Exception from recording callback: ") + e.what());
}
diff --git a/libs/libda/plugins/audio_dev_jack.cpp b/libs/libda/plugins/audio_dev_jack.cpp
index 13b41bd..aea5a24 100644
--- a/libs/libda/plugins/audio_dev_jack.cpp
+++ b/libs/libda/plugins/audio_dev_jack.cpp
@@ -30,10 +30,10 @@ namespace {
std::vector<sample_t> buf;
buf.reserve(frames * m_s.channels());
for (jack_nframes_t fr = 0; fr < frames; ++fr) for (size_t ch = 0; ch < m_ports.size(); ++ch) buf.push_back(*samples[ch]++);
- pcm_data data(&buf[0], frames, m_ports.size());
+ pcm_data data(&buf[0], frames, m_ports.size(), m_s.rate());
m_s.set_frames(frames);
try {
- m_s.callback()(data, m_s);
+ m_s.callback()(data);
} catch (std::exception& e) {
m_s.debug(std::string("Exception from recording callback: ") + e.what());
}
@@ -85,10 +85,10 @@ namespace {
void shutdown() { m_client = NULL; m_s.debug("da::jack_playback: JACK server shutdown; processing terminated."); }
int callback(jack_nframes_t frames) {
std::vector<sample_t> buf(frames * m_s.channels());
- pcm_data data(&buf[0], frames, m_ports.size());
+ pcm_data data(&buf[0], frames, m_ports.size(), m_s.rate());
m_s.set_frames(frames);
try {
- m_s.callback()(data, m_s);
+ m_s.callback()(data);
} catch (std::exception& e) {
m_s.debug(std::string("Exception from playback callback: ") + e.what());
}
diff --git a/libs/libda/plugins/audio_dev_pa18.cpp b/libs/libda/plugins/audio_dev_pa18.cpp
index cddcf80..a28bd26 100644
--- a/libs/libda/plugins/audio_dev_pa18.cpp
+++ b/libs/libda/plugins/audio_dev_pa18.cpp
@@ -13,8 +13,8 @@ namespace {
try {
std::vector<sample_t> buf(frames * self.s.channels());
std::transform(iptr, iptr + buf.size(), buf.begin(), conv_from_s16);
- pcm_data data(&buf[0], frames, self.s.channels());
- self.s.callback()(data, self.s);
+ pcm_data data(&buf[0], frames, self.s.channels(), self.s.rate());
+ self.s.callback()(data);
} catch (std::exception& e) {
self.s.debug(std::string("Exception from recording callback: ") + e.what());
}
@@ -54,8 +54,8 @@ namespace {
iptr[i] = 0;
try {
std::vector<sample_t> buf(frames * self.s.channels());
- pcm_data data(&buf[0], frames, self.s.channels());
- self.s.callback()(data, self.s);
+ pcm_data data(&buf[0], frames, self.s.channels(), self.s.rate());
+ self.s.callback()(data);
for( unsigned int i = 0 ; i < frames*self.s.channels() ; i++ )
iptr[i] = da::conv_to_s16(data[i]);
} catch (std::exception& e) {
diff --git a/libs/libda/plugins/audio_dev_pa19.cpp b/libs/libda/plugins/audio_dev_pa19.cpp
index f431410..2383c13 100644
--- a/libs/libda/plugins/audio_dev_pa19.cpp
+++ b/libs/libda/plugins/audio_dev_pa19.cpp
@@ -13,8 +13,8 @@ namespace {
try {
std::vector<sample_t> buf(frames * self.s.channels());
std::transform(iptr, iptr + buf.size(), buf.begin(), conv_from_s16);
- pcm_data data(&buf[0], frames, self.s.channels());
- self.s.callback()(data, self.s);
+ pcm_data data(&buf[0], frames, self.s.channels(), self.s.rate());
+ self.s.callback()(data);
} catch (std::exception& e) {
self.s.debug(std::string("Exception from recording callback: ") + e.what());
}
@@ -68,8 +68,8 @@ namespace {
iptr[i] = 0;
try {
std::vector<sample_t> buf(frames * self.s.channels());
- pcm_data data(&buf[0], frames, self.s.channels());
- self.s.callback()(data, self.s);
+ pcm_data data(&buf[0], frames, self.s.channels(), self.s.rate());
+ self.s.callback()(data);
for( unsigned int i = 0 ; i < frames*self.s.channels() ; i++ )
iptr[i] = da::conv_to_s16(data[i]);
} catch (std::exception& e) {
diff --git a/libs/libda/plugins/audio_dev_pulse.cpp b/libs/libda/plugins/audio_dev_pulse.cpp
index 0b14ed2..30c35a0 100644
--- a/libs/libda/plugins/audio_dev_pulse.cpp
+++ b/libs/libda/plugins/audio_dev_pulse.cpp
@@ -52,9 +52,9 @@ namespace {
const std::size_t channels = m_s.channels();
buf.resize(m_s.frames() * channels);
if (pa_simple_read(m_stream, &buf[0], buf.size() * sizeof(sample_t), NULL) < 0) continue;
- pcm_data data(&buf[0], buf.size() / channels, channels);
+ pcm_data data(&buf[0], buf.size() / channels, channels, m_s.rate());
try {
- m_s.callback()(data, m_s);
+ m_s.callback()(data);
} catch (std::exception& e) {
m_s.debug(std::string("Exception from recording callback: ") + e.what());
}
@@ -105,9 +105,9 @@ namespace {
while (!m_quit) {
const std::size_t channels = m_s.channels();
buf.resize(m_s.frames() * channels);
- pcm_data data(&buf[0], buf.size() / channels, channels);
+ pcm_data data(&buf[0], buf.size() / channels, channels, m_s.rate());
try {
- m_s.callback()(data, m_s);
+ m_s.callback()(data);
} catch (std::exception& e) {
m_s.debug(std::string("Exception from playback callback: ") + e.what());
}
diff --git a/libs/libda/plugins/audio_dev_tone.cpp b/libs/libda/plugins/audio_dev_tone.cpp
index a0140f1..b126e8d 100644
--- a/libs/libda/plugins/audio_dev_tone.cpp
+++ b/libs/libda/plugins/audio_dev_tone.cpp
@@ -97,8 +97,8 @@ namespace {
try {
std::vector<sample_t> buf(s.frames() * s.channels());
std::generate(buf.begin(), buf.end(), accumgen(gen, s.channels()));
- pcm_data data(&buf[0], s.frames(), s.channels());
- s.callback()(data, s);
+ pcm_data data(&buf[0], s.frames(), s.channels(), s.rate());
+ s.callback()(data);
} catch (std::exception& e) {
s.debug(std::string("Exception from recording callback: ") + e.what());
}
|