From 179e29d788dd70770728429b5e4228bf64fc946d Mon Sep 17 00:00:00 2001 From: Werner Schweer Date: Wed, 25 Jun 2008 18:13:47 +0000 Subject: updates --- muse/muse/audio.cpp | 2 +- muse/muse/audioinput.cpp | 2 +- muse/muse/audiooutput.cpp | 2 +- muse/muse/audiotrack.cpp | 2 +- muse/muse/dssihost.cpp | 2 +- muse/muse/midi.cpp | 2 +- muse/muse/midififo.h | 2 +- muse/muse/midiinport.cpp | 2 +- muse/muse/midioutport.cpp | 2 +- muse/muse/mixer/astrip.cpp | 2 +- muse/muse/mixer/mstrip.cpp | 2 +- muse/muse/mixer/routedialog.cpp | 4 ++-- muse/muse/muse.cpp | 2 +- muse/muse/route.cpp | 2 +- muse/muse/route.h | 2 +- muse/muse/seqmsg.cpp | 2 +- muse/muse/song.cpp | 2 +- muse/muse/songtrack.cpp | 2 +- muse/muse/sync.cpp | 2 +- muse/muse/synth.cpp | 2 +- muse/muse/track.cpp | 2 +- muse/muse/track.h | 2 +- muse/muse/vst.cpp | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/muse/muse/audio.cpp b/muse/muse/audio.cpp index 05442f96..dd68c6bc 100644 --- a/muse/muse/audio.cpp +++ b/muse/muse/audio.cpp @@ -24,7 +24,7 @@ #include "muse.h" #include "globals.h" #include "song.h" -#include "driver/audiodev.h" +#include "audiodev.h" #include "audioprefetch.h" #include "audiowriteback.h" #include "audio.h" diff --git a/muse/muse/audioinput.cpp b/muse/muse/audioinput.cpp index 829ebfb7..fe7c57bb 100644 --- a/muse/muse/audioinput.cpp +++ b/muse/muse/audioinput.cpp @@ -20,7 +20,7 @@ #include "globals.h" #include "audioinput.h" -#include "driver/jackaudio.h" +#include "jackaudio.h" #include "audio.h" //--------------------------------------------------------- diff --git a/muse/muse/audiooutput.cpp b/muse/muse/audiooutput.cpp index 330f0665..e4937a74 100644 --- a/muse/muse/audiooutput.cpp +++ b/muse/muse/audiooutput.cpp @@ -19,7 +19,7 @@ //============================================================================= #include "audiooutput.h" -#include "driver/jackaudio.h" +#include "jackaudio.h" #include "audio.h" #include "globals.h" #include "song.h" diff --git a/muse/muse/audiotrack.cpp b/muse/muse/audiotrack.cpp index 375efd6e..04d215f2 100644 --- a/muse/muse/audiotrack.cpp +++ b/muse/muse/audiotrack.cpp @@ -28,7 +28,7 @@ #include "wave.h" #include "auxplugin.h" #include "pipeline.h" -#include "driver/audiodev.h" +#include "audiodev.h" #include "gconfig.h" //--------------------------------------------------------- diff --git a/muse/muse/dssihost.cpp b/muse/muse/dssihost.cpp index a367fd8f..f349ccc8 100644 --- a/muse/muse/dssihost.cpp +++ b/muse/muse/dssihost.cpp @@ -29,7 +29,7 @@ #include "dssihost.h" #include "synth.h" -#include "driver/jackaudio.h" +#include "jackaudio.h" #include "midi.h" #include "al/al.h" #include "al/xml.h" diff --git a/muse/muse/midi.cpp b/muse/muse/midi.cpp index 122055a6..a182fe4a 100644 --- a/muse/muse/midi.cpp +++ b/muse/muse/midi.cpp @@ -26,7 +26,7 @@ #include "midictrl.h" #include "midictrl.h" #include "audio.h" -#include "driver/audiodev.h" +#include "audiodev.h" #include "wave.h" #include "synth.h" #include "sync.h" diff --git a/muse/muse/midififo.h b/muse/muse/midififo.h index 2372f89e..e2342feb 100644 --- a/muse/muse/midififo.h +++ b/muse/muse/midififo.h @@ -22,7 +22,7 @@ #define __MIDIFIFO_H__ #include "midievent.h" -#include "driver/port.h" +#include "port.h" #define MIDI_FIFO_SIZE 512 diff --git a/muse/muse/midiinport.cpp b/muse/muse/midiinport.cpp index 22671375..dd39ec33 100644 --- a/muse/muse/midiinport.cpp +++ b/muse/muse/midiinport.cpp @@ -23,7 +23,7 @@ #include "midi.h" #include "midictrl.h" #include "al/xml.h" -#include "driver/audiodev.h" +#include "audiodev.h" #include "audio.h" #include "gconfig.h" diff --git a/muse/muse/midioutport.cpp b/muse/muse/midioutport.cpp index e385529a..e3acc736 100644 --- a/muse/muse/midioutport.cpp +++ b/muse/muse/midioutport.cpp @@ -24,7 +24,7 @@ #include "al/al.h" #include "al/tempo.h" #include "al/xml.h" -#include "driver/audiodev.h" +#include "audiodev.h" #include "audio.h" #include "midioutport.h" #include "sync.h" diff --git a/muse/muse/mixer/astrip.cpp b/muse/muse/mixer/astrip.cpp index dae88d49..8d6cdd09 100644 --- a/muse/muse/mixer/astrip.cpp +++ b/muse/muse/mixer/astrip.cpp @@ -19,7 +19,7 @@ //============================================================================= #include "audio.h" -#include "driver/audiodev.h" +#include "audiodev.h" #include "song.h" #include "astrip.h" #include "synth.h" diff --git a/muse/muse/mixer/mstrip.cpp b/muse/muse/mixer/mstrip.cpp index bf2238ea..d4c48f5e 100644 --- a/muse/muse/mixer/mstrip.cpp +++ b/muse/muse/mixer/mstrip.cpp @@ -25,7 +25,7 @@ #include "mixer.h" #include "widgets/simplebutton.h" #include "widgets/utils.h" -#include "driver/audiodev.h" +#include "audiodev.h" #include "synth.h" #include "midirack.h" #include "midiplugin.h" diff --git a/muse/muse/mixer/routedialog.cpp b/muse/muse/mixer/routedialog.cpp index 0a883646..a2f3b584 100644 --- a/muse/muse/mixer/routedialog.cpp +++ b/muse/muse/mixer/routedialog.cpp @@ -22,7 +22,7 @@ #include "track.h" #include "song.h" #include "audio.h" -#include "driver/jackaudio.h" +#include "jackaudio.h" //--------------------------------------------------------- // RouteDialog @@ -70,7 +70,7 @@ void RouteDialog::routingChanged() new QListWidgetItem(routeList, r->name(), dst.name()); } } - else + else newDstList->insertItem(Route(track, -1).name()); if (track->type() == Track::AUDIO_OUTPUT) { for (int channel = 0; channel < track->channels(); ++channel) { diff --git a/muse/muse/muse.cpp b/muse/muse/muse.cpp index 54b2569c..c6dbc103 100644 --- a/muse/muse/muse.cpp +++ b/muse/muse/muse.cpp @@ -34,7 +34,7 @@ #include "master/masteredit.h" #include "midiedit/drumedit.h" #include "mixer/mixer.h" -#include "driver/audiodev.h" +#include "audiodev.h" #include "waveedit/waveedit.h" #include "icons.h" #include "widgets/mixdowndialog.h" diff --git a/muse/muse/route.cpp b/muse/muse/route.cpp index dee6c03c..a529eb9c 100644 --- a/muse/muse/route.cpp +++ b/muse/muse/route.cpp @@ -23,7 +23,7 @@ #include "audio.h" #include "track.h" #include "synth.h" -#include "driver/audiodev.h" +#include "audiodev.h" #include "al/xml.h" #include "auxplugin.h" diff --git a/muse/muse/route.h b/muse/muse/route.h index 48300c60..386ea636 100644 --- a/muse/muse/route.h +++ b/muse/muse/route.h @@ -29,7 +29,7 @@ namespace AL { }; using AL::Xml; -#include "driver/driver.h" +#include "driver.h" //--------------------------------------------------------- // RouteNode diff --git a/muse/muse/seqmsg.cpp b/muse/muse/seqmsg.cpp index ec22926a..4df58e89 100644 --- a/muse/muse/seqmsg.cpp +++ b/muse/muse/seqmsg.cpp @@ -25,7 +25,7 @@ #include "al/tempo.h" #include "al/sig.h" #include "audio.h" -#include "driver/audiodev.h" +#include "audiodev.h" #include "audio.h" #include "arranger/arranger.h" #include "plugin.h" diff --git a/muse/muse/song.cpp b/muse/muse/song.cpp index dd162410..dd78cc5c 100644 --- a/muse/muse/song.cpp +++ b/muse/muse/song.cpp @@ -27,7 +27,7 @@ #include "midiedit/drummap.h" #include "audio.h" #include "mixer/mixer.h" -#include "driver/audiodev.h" +#include "audiodev.h" #include "gconfig.h" #include "al/marker.h" #include "al/sig.h" diff --git a/muse/muse/songtrack.cpp b/muse/muse/songtrack.cpp index 642926ac..8a865620 100644 --- a/muse/muse/songtrack.cpp +++ b/muse/muse/songtrack.cpp @@ -21,7 +21,7 @@ #include "song.h" #include "audio.h" #include "midiplugin.h" -#include "driver/audiodev.h" +#include "audiodev.h" #include "muse.h" //--------------------------------------------------------- diff --git a/muse/muse/sync.cpp b/muse/muse/sync.cpp index e72c143c..c4cb30fc 100644 --- a/muse/muse/sync.cpp +++ b/muse/muse/sync.cpp @@ -23,7 +23,7 @@ #include "widgets/utils.h" #include "globals.h" #include "audio.h" -#include "driver/audiodev.h" +#include "audiodev.h" #include "gconfig.h" #include "al/tempo.h" #include "al/al.h" diff --git a/muse/muse/synth.cpp b/muse/muse/synth.cpp index 4445dbcc..67673d24 100644 --- a/muse/muse/synth.cpp +++ b/muse/muse/synth.cpp @@ -34,7 +34,7 @@ #include "audio.h" #include "midictrl.h" #include "instruments/minstrument.h" -#include "driver/audiodev.h" +#include "audiodev.h" std::vector synthis; // array of available synthis diff --git a/muse/muse/track.cpp b/muse/muse/track.cpp index 7b7df1ce..93d92ac1 100644 --- a/muse/muse/track.cpp +++ b/muse/muse/track.cpp @@ -28,7 +28,7 @@ #include "midictrl.h" #include "part.h" #include "gui.h" -#include "driver/audiodev.h" +#include "audiodev.h" // synchronize with TrackType!: diff --git a/muse/muse/track.h b/muse/muse/track.h index ff9dde64..1afa3cc2 100644 --- a/muse/muse/track.h +++ b/muse/muse/track.h @@ -21,7 +21,7 @@ #ifndef __TRACK_H__ #define __TRACK_H__ -#include "driver/port.h" +#include "port.h" #include "al/pos.h" #include "route.h" #include "ctrl.h" diff --git a/muse/muse/vst.cpp b/muse/muse/vst.cpp index eb0d044e..f91d1322 100644 --- a/muse/muse/vst.cpp +++ b/muse/muse/vst.cpp @@ -33,7 +33,7 @@ #include "vst.h" #include "globals.h" #include "synth.h" -#include "driver/jackaudio.h" +#include "jackaudio.h" #include "midi.h" #include "al/xml.h" #include "song.h" -- cgit v1.2.3