[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/engine AudioDevice.cpp
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src/engine AudioDevice.cpp |
Date: |
Mon, 21 Jan 2008 17:20:41 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 08/01/21 17:20:41
Modified files:
src/engine : AudioDevice.cpp
Log message:
Only add AudioChannels to an AudioBus in setup_buses() if
playback/captureChannels.value() returned a channel!
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/AudioDevice.cpp?cvsroot=traverso&r1=1.51&r2=1.52
Patches:
Index: AudioDevice.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/engine/AudioDevice.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- AudioDevice.cpp 21 Jan 2008 16:22:15 -0000 1.51
+++ AudioDevice.cpp 21 Jan 2008 17:20:41 -0000 1.52
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: AudioDevice.cpp,v 1.51 2008/01/21 16:22:15 r_sijrier Exp $
+$Id: AudioDevice.cpp,v 1.52 2008/01/21 17:20:41 r_sijrier Exp $
*/
#include "AudioDevice.h"
@@ -553,12 +553,19 @@
int number = 1;
QByteArray name;
- // FIXME check if value() return an AudioChannel!!!!!!!!!!!!!
+ AudioChannel* channel;
+
for (int i=1; i <= captureChannels.size();) {
name = "Capture " + QByteArray::number(number++);
AudioBus* bus = new AudioBus(name);
-
bus->add_channel(captureChannels.value("capture_"+QByteArray::number(i++)));
-
bus->add_channel(captureChannels.value("capture_"+QByteArray::number(i++)));
+ channel =
captureChannels.value("capture_"+QByteArray::number(i++), 0);
+ if (channel) {
+ bus->add_channel(channel);
+ }
+ channel =
captureChannels.value("capture_"+QByteArray::number(i++), 0);
+ if (channel) {
+ bus->add_channel(channel);
+ }
captureBuses.insert(name, bus);
}
// PWARN("Capture buses count is: %d", captureBuses.size());
@@ -568,8 +575,14 @@
for (int i=1; i <= playbackChannels.size();) {
name = "Playback " + QByteArray::number(number++);
AudioBus* bus = new AudioBus(name);
-
bus->add_channel(playbackChannels.value("playback_"+QByteArray::number(i++)));
-
bus->add_channel(playbackChannels.value("playback_"+QByteArray::number(i++)));
+ channel =
playbackChannels.value("playback_"+QByteArray::number(i++), 0);
+ if (channel) {
+ bus->add_channel(channel);
+ }
+ channel =
playbackChannels.value("playback_"+QByteArray::number(i++), 0);
+ if (channel) {
+ bus->add_channel(channel);
+ }
playbackBuses.insert(name, bus);
}
// PWARN("Playback buses count is: %d", playbackBuses.size());
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src/engine AudioDevice.cpp,
Remon Sijrier <=