diff options
Diffstat (limited to 'audio/tse3')
17 files changed, 128 insertions, 148 deletions
diff --git a/audio/tse3/files/patch-OSS.cpp b/audio/tse3/files/patch-OSS.cpp deleted file mode 100644 index a30a611e97d9..000000000000 --- a/audio/tse3/files/patch-OSS.cpp +++ /dev/null @@ -1,83 +0,0 @@ -*** src/tse3/plt/OSS.cpp.orig 2005-07-25 20:22:56.000000000 +0900 ---- src/tse3/plt/OSS.cpp 2009-04-02 21:20:35.000000000 +0900 -*************** -*** 25,30 **** ---- 25,31 ---- - #include <fcntl.h> - #include <stdarg.h> - #include <sys/types.h> -+ #include <cstring> - - // These #includes are linux specific and I need to do some autoconf - // magic to work out how to conditionally include them -*************** -*** 1484,1494 **** - #ifdef TSE3_WITH_OSS - // Happily, if you switch -pedantic on in gcc these macros will always - // throw up warnings. Marvel at the beauty of awe_voice.h for reasons why. -! - AWE_SET_CHANNEL_MODE(deviceno, AWE_PLAY_MULTI); - AWE_SET_CHANNEL_MODE(deviceno, 1); - AWE_DRUM_CHANNELS(deviceno, 1<<9); - AWE_TERMINATE_ALL(deviceno); - seqbuf_dump(); - #endif - } ---- 1485,1496 ---- - #ifdef TSE3_WITH_OSS - // Happily, if you switch -pedantic on in gcc these macros will always - // throw up warnings. Marvel at the beauty of awe_voice.h for reasons why. -! #if 0 - AWE_SET_CHANNEL_MODE(deviceno, AWE_PLAY_MULTI); - AWE_SET_CHANNEL_MODE(deviceno, 1); - AWE_DRUM_CHANNELS(deviceno, 1<<9); - AWE_TERMINATE_ALL(deviceno); -+ #endif - seqbuf_dump(); - #endif - } -*************** -*** 1996,2002 **** - // there is no soundcard - throw TSE3::MidiSchedulerError(TSE3::MidiSchedulerCreateErr); - } -! ioctl(seqfd, SNDCTL_SEQ_NRMIDIS, &nomidis); - rate = 0; - ioctl(seqfd, SNDCTL_SEQ_CTRLRATE, &rate); - if (rate == -1 || rate <= 0) rate = 100; ---- 1998,2005 ---- - // there is no soundcard - throw TSE3::MidiSchedulerError(TSE3::MidiSchedulerCreateErr); - } -! // ioctl(seqfd, SNDCTL_SEQ_NRMIDIS, &nomidis); -! nomidis = 0; - rate = 0; - ioctl(seqfd, SNDCTL_SEQ_CTRLRATE, &rate); - if (rate == -1 || rate <= 0) rate = 100; -*************** -*** 2044,2049 **** ---- 2047,2060 ---- - } - std::cout << ")\n"; - } -+ #if 1 -+ devices[n] -+ = new OSSMidiScheduler_AWEDevice(n, synthinfo[n], seqfd, -+ _seqbuf, _seqbuflen, -+ _seqbufptr); -+ } -+ } -+ #else - if (synthinfo[n].synth_type == SYNTH_TYPE_SAMPLE - && synthinfo[n].synth_subtype == SAMPLE_TYPE_AWE32) - { -*************** -*** 2100,2105 **** ---- 2111,2117 ---- - } - } - -+ #endif - // Now let the public API know about these devices - for (unsigned int n = 0; n < nodevices; ++n) - { diff --git a/audio/tse3/files/patch-src__tse3__MidiFile.cpp b/audio/tse3/files/patch-src__tse3__MidiFile.cpp deleted file mode 100644 index 15b6060c9860..000000000000 --- a/audio/tse3/files/patch-src__tse3__MidiFile.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/tse3/MidiFile.cpp.orig 2005-07-25 20:23:00.000000000 +0900 -+++ src/tse3/MidiFile.cpp 2009-04-02 13:01:31.000000000 +0900 -@@ -32,6 +32,7 @@ - #include <string> - #include <queue> - #include <math.h> -+#include <cstring> - - using namespace TSE3; - diff --git a/audio/tse3/files/patch-src__tse3__Serializable.h b/audio/tse3/files/patch-src__tse3__Serializable.h deleted file mode 100644 index 43f9c581c198..000000000000 --- a/audio/tse3/files/patch-src__tse3__Serializable.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/tse3/Serializable.h.orig 2005-07-25 20:23:00.000000000 +0900 -+++ src/tse3/Serializable.h 2009-04-02 13:01:31.000000000 +0900 -@@ -20,6 +20,7 @@ - #include <iosfwd> - #include <iomanip> - #include <cstddef> -+#include <iostream> - - namespace TSE3 - { diff --git a/audio/tse3/files/patch-src__tse3__TSE2MDL.cpp b/audio/tse3/files/patch-src__tse3__TSE2MDL.cpp deleted file mode 100644 index a7ce5718054d..000000000000 --- a/audio/tse3/files/patch-src__tse3__TSE2MDL.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/tse3/TSE2MDL.cpp.orig 2005-07-25 20:23:00.000000000 +0900 -+++ src/tse3/TSE2MDL.cpp 2009-04-02 13:01:31.000000000 +0900 -@@ -38,6 +38,7 @@ - #include "tse3/Progress.h" - - #include <fstream> -+#include <cstring> - - using namespace TSE3; - diff --git a/audio/tse3/files/patch-src__tse3__cmd__Phrase.h b/audio/tse3/files/patch-src__tse3__cmd__Phrase.h deleted file mode 100644 index 5cd236343507..000000000000 --- a/audio/tse3/files/patch-src__tse3__cmd__Phrase.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/tse3/cmd/Phrase.h.orig 2005-07-25 20:22:38.000000000 +0900 -+++ src/tse3/cmd/Phrase.h 2009-04-02 13:01:31.000000000 +0900 -@@ -29,6 +29,7 @@ - class Phrase; - class Song; - class Part; -+ class PhraseEdit; - - namespace Cmd - { diff --git a/audio/tse3/files/patch-src__tse3__file__MidiFilter.cpp b/audio/tse3/files/patch-src__tse3__file__MidiFilter.cpp deleted file mode 100644 index b1be7df520b8..000000000000 --- a/audio/tse3/files/patch-src__tse3__file__MidiFilter.cpp +++ /dev/null @@ -1,9 +0,0 @@ ---- src/tse3/file/MidiFilter.cpp Tue Aug 23 08:32:31 2005 -+++ src/tse3/file/MidiFilter.cpp Sun Sep 11 20:33:13 2005 -@@ -11,5 +11,5 @@ - - writer.element("Status", mf.status()); -- unsigned int c_filter = 0, p_filter = 0; -+ size_t c_filter = 0, p_filter = 0; - for (int n = 0; n < 16; n++) if (mf.channelFilter(n)) c_filter |= (1<<n); - writer.element("ChannelFilter", c_filter); diff --git a/audio/tse3/files/patch-src__tse3__file__XML.cpp b/audio/tse3/files/patch-src__tse3__file__XML.cpp deleted file mode 100644 index bf89b641bb58..000000000000 --- a/audio/tse3/files/patch-src__tse3__file__XML.cpp +++ /dev/null @@ -1,9 +0,0 @@ ---- src/tse3/file/XML.cpp Tue Aug 23 08:32:53 2005 -+++ src/tse3/file/XML.cpp Sun Sep 11 20:29:22 2005 -@@ -111,5 +111,5 @@ - - --void TSE3::File::XmlFileWriter::element(const std::string &name, unsigned int value) -+void TSE3::File::XmlFileWriter::element(const std::string &name, size_t value) - { - indent(out); diff --git a/audio/tse3/files/patch-src__examples__recording__recording.cpp b/audio/tse3/files/patch-src_examples_recording_recording.cpp index 83b0ed05c63c..71f40c567640 100644 --- a/audio/tse3/files/patch-src__examples__recording__recording.cpp +++ b/audio/tse3/files/patch-src_examples_recording_recording.cpp @@ -1,5 +1,5 @@ ---- src/examples/recording/recording.cpp.orig 2005-07-25 20:22:31.000000000 +0900 -+++ src/examples/recording/recording.cpp 2009-04-02 13:23:23.000000000 +0900 +--- src/examples/recording/recording.cpp.orig 2005-07-25 11:22:31 UTC ++++ src/examples/recording/recording.cpp @@ -27,6 +27,7 @@ **************************************************************/ diff --git a/audio/tse3/files/patch-src_tse3_MidiFile.cpp b/audio/tse3/files/patch-src_tse3_MidiFile.cpp new file mode 100644 index 000000000000..00c81ca263d1 --- /dev/null +++ b/audio/tse3/files/patch-src_tse3_MidiFile.cpp @@ -0,0 +1,10 @@ +--- src/tse3/MidiFile.cpp.orig 2005-07-25 11:23:00 UTC ++++ src/tse3/MidiFile.cpp +@@ -32,6 +32,7 @@ + #include <string> + #include <queue> + #include <math.h> ++#include <cstring> + + using namespace TSE3; + diff --git a/audio/tse3/files/patch-src_tse3_Serializable.h b/audio/tse3/files/patch-src_tse3_Serializable.h new file mode 100644 index 000000000000..d6fa38aec24a --- /dev/null +++ b/audio/tse3/files/patch-src_tse3_Serializable.h @@ -0,0 +1,10 @@ +--- src/tse3/Serializable.h.orig 2005-07-25 11:23:00 UTC ++++ src/tse3/Serializable.h +@@ -20,6 +20,7 @@ + #include <iosfwd> + #include <iomanip> + #include <cstddef> ++#include <iostream> + + namespace TSE3 + { diff --git a/audio/tse3/files/patch-src_tse3_TSE2MDL.cpp b/audio/tse3/files/patch-src_tse3_TSE2MDL.cpp new file mode 100644 index 000000000000..d7d74c106ae8 --- /dev/null +++ b/audio/tse3/files/patch-src_tse3_TSE2MDL.cpp @@ -0,0 +1,10 @@ +--- src/tse3/TSE2MDL.cpp.orig 2005-07-25 11:23:00 UTC ++++ src/tse3/TSE2MDL.cpp +@@ -38,6 +38,7 @@ + #include "tse3/Progress.h" + + #include <fstream> ++#include <cstring> + + using namespace TSE3; + diff --git a/audio/tse3/files/patch-src_tse3_cmd_Phrase.h b/audio/tse3/files/patch-src_tse3_cmd_Phrase.h new file mode 100644 index 000000000000..14c9787ae066 --- /dev/null +++ b/audio/tse3/files/patch-src_tse3_cmd_Phrase.h @@ -0,0 +1,10 @@ +--- src/tse3/cmd/Phrase.h.orig 2005-07-25 11:22:38 UTC ++++ src/tse3/cmd/Phrase.h +@@ -29,6 +29,7 @@ namespace TSE3 + class Phrase; + class Song; + class Part; ++ class PhraseEdit; + + namespace Cmd + { diff --git a/audio/tse3/files/patch-src_tse3_file_MidiFilter.cpp b/audio/tse3/files/patch-src_tse3_file_MidiFilter.cpp new file mode 100644 index 000000000000..f89db30d8d0f --- /dev/null +++ b/audio/tse3/files/patch-src_tse3_file_MidiFilter.cpp @@ -0,0 +1,11 @@ +--- src/tse3/file/MidiFilter.cpp.orig 2005-08-23 12:32:31 UTC ++++ src/tse3/file/MidiFilter.cpp +@@ -10,7 +10,7 @@ void TSE3::File::write(XmlFileWriter &wr + TSE3::File::XmlFileWriter::AutoElement ae(writer, "MidiFilter"); + + writer.element("Status", mf.status()); +- unsigned int c_filter = 0, p_filter = 0; ++ size_t c_filter = 0, p_filter = 0; + for (int n = 0; n < 16; n++) if (mf.channelFilter(n)) c_filter |= (1<<n); + writer.element("ChannelFilter", c_filter); + writer.element("PortFilter", p_filter); diff --git a/audio/tse3/files/patch-src_tse3_file_XML.cpp b/audio/tse3/files/patch-src_tse3_file_XML.cpp new file mode 100644 index 000000000000..3f732e18bf09 --- /dev/null +++ b/audio/tse3/files/patch-src_tse3_file_XML.cpp @@ -0,0 +1,11 @@ +--- src/tse3/file/XML.cpp.orig 2005-08-23 12:32:53 UTC ++++ src/tse3/file/XML.cpp +@@ -110,7 +110,7 @@ void TSE3::File::XmlFileWriter::element( + } + + +-void TSE3::File::XmlFileWriter::element(const std::string &name, unsigned int value) ++void TSE3::File::XmlFileWriter::element(const std::string &name, size_t value) + { + indent(out); + out << "<" << name << " value=\"" << value << "\"/>\n"; diff --git a/audio/tse3/files/patch-src__tse3__file__XML.h b/audio/tse3/files/patch-src_tse3_file_XML.h index 3dffaeafef6e..0db96e629b53 100644 --- a/audio/tse3/files/patch-src__tse3__file__XML.h +++ b/audio/tse3/files/patch-src_tse3_file_XML.h @@ -1,9 +1,11 @@ ---- src/tse3/file/XML.h Tue Aug 23 08:37:53 2005 -+++ src/tse3/file/XML.h Sun Sep 11 20:29:45 2005 -@@ -154,5 +154,5 @@ +--- src/tse3/file/XML.h.orig 2005-08-23 12:37:53 UTC ++++ src/tse3/file/XML.h +@@ -153,7 +153,7 @@ namespace TSE3 + void element(const std::string &name, const std::string &value); void element(const std::string &name, const char *value); void element(const std::string &name, int value); - void element(const std::string &name, unsigned int value); + void element(const std::string &name, size_t value); void element(const std::string &name, bool value); + void comment(const std::string &comment); diff --git a/audio/tse3/files/patch-src_tse3_plt_OSS.cpp b/audio/tse3/files/patch-src_tse3_plt_OSS.cpp new file mode 100644 index 000000000000..b9d9ef03ea3b --- /dev/null +++ b/audio/tse3/files/patch-src_tse3_plt_OSS.cpp @@ -0,0 +1,57 @@ +--- src/tse3/plt/OSS.cpp.orig 2005-07-25 11:22:56 UTC ++++ src/tse3/plt/OSS.cpp +@@ -25,6 +25,7 @@ + #include <fcntl.h> + #include <stdarg.h> + #include <sys/types.h> ++#include <cstring> + + // These #includes are linux specific and I need to do some autoconf + // magic to work out how to conditionally include them +@@ -1484,11 +1485,12 @@ OSSMidiScheduler_AWEDevice::OSSMidiSched + #ifdef TSE3_WITH_OSS + // Happily, if you switch -pedantic on in gcc these macros will always + // throw up warnings. Marvel at the beauty of awe_voice.h for reasons why. +- ++#if 0 + AWE_SET_CHANNEL_MODE(deviceno, AWE_PLAY_MULTI); + AWE_SET_CHANNEL_MODE(deviceno, 1); + AWE_DRUM_CHANNELS(deviceno, 1<<9); + AWE_TERMINATE_ALL(deviceno); ++#endif + seqbuf_dump(); + #endif + } +@@ -1996,7 +1998,8 @@ OSSMidiScheduler::OSSMidiScheduler() + // there is no soundcard + throw TSE3::MidiSchedulerError(TSE3::MidiSchedulerCreateErr); + } +- ioctl(seqfd, SNDCTL_SEQ_NRMIDIS, &nomidis); ++ // ioctl(seqfd, SNDCTL_SEQ_NRMIDIS, &nomidis); ++ nomidis = 0; + rate = 0; + ioctl(seqfd, SNDCTL_SEQ_CTRLRATE, &rate); + if (rate == -1 || rate <= 0) rate = 100; +@@ -2044,6 +2047,14 @@ OSSMidiScheduler::OSSMidiScheduler() + } + std::cout << ")\n"; + } ++#if 1 ++ devices[n] ++ = new OSSMidiScheduler_AWEDevice(n, synthinfo[n], seqfd, ++ _seqbuf, _seqbuflen, ++ _seqbufptr); ++ } ++ } ++#else + if (synthinfo[n].synth_type == SYNTH_TYPE_SAMPLE + && synthinfo[n].synth_subtype == SAMPLE_TYPE_AWE32) + { +@@ -2100,6 +2111,7 @@ OSSMidiScheduler::OSSMidiScheduler() + } + } + ++#endif + // Now let the public API know about these devices + for (unsigned int n = 0; n < nodevices; ++n) + { diff --git a/audio/tse3/files/patch-src__tse3play__tse3play.cpp b/audio/tse3/files/patch-src_tse3play_tse3play.cpp index 612f0b5fb4ef..a570ae095ed1 100644 --- a/audio/tse3/files/patch-src__tse3play__tse3play.cpp +++ b/audio/tse3/files/patch-src_tse3play_tse3play.cpp @@ -1,5 +1,5 @@ ---- src/tse3play/tse3play.cpp.orig 2005-08-23 21:58:35.000000000 +0900 -+++ src/tse3play/tse3play.cpp 2009-04-02 13:01:31.000000000 +0900 +--- src/tse3play/tse3play.cpp.orig 2005-08-23 12:58:35 UTC ++++ src/tse3play/tse3play.cpp @@ -32,6 +32,7 @@ #include "tse3/Error.h" #include "tse3/Metronome.h" |