diff options
Diffstat (limited to 'src/base')
36 files changed, 160 insertions, 160 deletions
diff --git a/src/base/AnalysisTypes.cpp b/src/base/AnalysisTypes.cpp index b2d8727..a07fd96 100644 --- a/src/base/AnalysisTypes.cpp +++ b/src/base/AnalysisTypes.cpp @@ -109,7 +109,7 @@ AnalysisHelper::labelChords(CompositionTimeSliceAdapter &c, Segment &s, if ((*i)->isa(Note::EventType)) { int bass = 999; - int mask = 0; + int tqmask = 0; GlobalChord chord(c, i, quantizer); if (chord.size() == 0) continue; @@ -121,15 +121,15 @@ AnalysisHelper::labelChords(CompositionTimeSliceAdapter &c, Segment &s, assert(bass == 999); // should be in ascending order already bass = pitch; } - mask |= 1 << (pitch % 12); + tqmask |= 1 << (pitch % 12); } } i = chord.getFinalElement(); - if (mask == 0) continue; + if (tqmask == 0) continue; - ChordLabel ch(key, mask, bass); + ChordLabel ch(key, tqmask, bass); if (ch.isValid()) { @@ -154,15 +154,15 @@ ChordLabel::ChordLabel() checkMap(); } -ChordLabel::ChordLabel(Key key, int mask, int /* bass */) : +ChordLabel::ChordLabel(Key key, int tqmask, int /* bass */) : m_data() { checkMap(); // Look for a chord built on an unaltered scale step of the current key. - for (ChordMap::iterator i = m_chordMap.find(mask); - i != m_chordMap.end() && i->first==mask; ++i) + for (ChordMap::iterator i = m_chordMap.find(tqmask); + i != m_chordMap.end() && i->first==tqmask; ++i) { if (Pitch(i->second.m_rootPitch).isDiatonicInKey(key)) @@ -233,8 +233,8 @@ ChordLabel::checkMap() // What the basicChordMasks mean: each bit set in each one represents // a pitch class (pitch%12) in a chord. C major has three pitch // classes, C, E, and G natural; if you take the MIDI pitches - // of those notes modulo 12, you get 0, 4, and 7, so the mask for - // major triads is (1<<0)+(1<<4)+(1<<7). All the masks are for chords + // of those notes modulo 12, you get 0, 4, and 7, so the tqmask for + // major triads is (1<<0)+(1<<4)+(1<<7). All the tqmasks are for chords // built on C. const int basicChordMasks[8] = @@ -249,8 +249,8 @@ ChordLabel::checkMap() 1 + (1<<3) + (1<<6) + (1<<9) // diminished 7th }; - // Each mask is inserted into the map rotated twelve ways; each - // rotation is a mask you would get by transposing the chord + // Each tqmask is inserted into the map rotated twelve ways; each + // rotation is a tqmask you would get by transposing the chord // to have a new root (i.e., C, C#, D, D#, E, F...) for (int i = 0; i < 8; ++i) diff --git a/src/base/AnalysisTypes.h b/src/base/AnalysisTypes.h index d7eabad..df3a416 100644 --- a/src/base/AnalysisTypes.h +++ b/src/base/AnalysisTypes.h @@ -62,8 +62,8 @@ NoChord = "no-chord", /////////////////////////////////////////////////////////////////////////// /** - * ChordLabel names chords and identifies them from their masks. See - * ChordLabel::checkMap() for details on what the masks are and + * ChordLabel names chords and identifies them from their tqmasks. See + * ChordLabel::checkMap() for details on what the tqmasks are and * AnalysisHelper::labelChords() for an example. */ @@ -71,7 +71,7 @@ class ChordLabel { public: ChordLabel(); - ChordLabel(Key key, int mask, int bass); + ChordLabel(Key key, int tqmask, int bass); ChordLabel(ChordType type, int rootPitch, int inversion = 0) : m_data(type, rootPitch, inversion) { }; int rootPitch(); diff --git a/src/base/BaseProperties.cpp b/src/base/BaseProperties.cpp index adff519..be964ac 100644 --- a/src/base/BaseProperties.cpp +++ b/src/base/BaseProperties.cpp @@ -115,7 +115,7 @@ const PropertyName TRIGGER_SEGMENT_RETUNE = "triggersegmentretune"; const PropertyName TRIGGER_SEGMENT_ADJUST_TIMES = "triggersegmentadjusttimes"; const std::string TRIGGER_SEGMENT_ADJUST_NONE = "none"; -const std::string TRIGGER_SEGMENT_ADJUST_SQUISH = "squish"; +const std::string TRIGGER_SEGMENT_ADJUST_STQUISH = "squish"; const std::string TRIGGER_SEGMENT_ADJUST_SYNC_START = "syncstart"; const std::string TRIGGER_SEGMENT_ADJUST_SYNC_END = "syncend"; diff --git a/src/base/BaseProperties.h b/src/base/BaseProperties.h index f83b2f7..44cd477 100644 --- a/src/base/BaseProperties.h +++ b/src/base/BaseProperties.h @@ -62,7 +62,7 @@ extern const PropertyName TRIGGER_SEGMENT_RETUNE; extern const PropertyName TRIGGER_SEGMENT_ADJUST_TIMES; extern const std::string TRIGGER_SEGMENT_ADJUST_NONE; -extern const std::string TRIGGER_SEGMENT_ADJUST_SQUISH; +extern const std::string TRIGGER_SEGMENT_ADJUST_STQUISH; extern const std::string TRIGGER_SEGMENT_ADJUST_SYNC_START; extern const std::string TRIGGER_SEGMENT_ADJUST_SYNC_END; diff --git a/src/base/BasicQuantizer.h b/src/base/BasicQuantizer.h index 1a9a7b7..2f3ce9e 100644 --- a/src/base/BasicQuantizer.h +++ b/src/base/BasicQuantizer.h @@ -19,8 +19,8 @@ COPYING included with this distribution for more information. */ -#ifndef BASIC_QUANTIZER_H -#define BASIC_QUANTIZER_H +#ifndef BASIC_TQUANTIZER_H +#define BASIC_TQUANTIZER_H #include "Quantizer.h" diff --git a/src/base/Clipboard.h b/src/base/Clipboard.h index e205e33..9400698 100644 --- a/src/base/Clipboard.h +++ b/src/base/Clipboard.h @@ -35,7 +35,7 @@ class EventSelection; * editing operations. Conceptually it has two "modes", * single-segment and multiple-segment, although there's no particular * distinction behind the scenes. The Clipboard owns all the segments - * it contains -- they should always be deep copies, not aliases. + * it tqcontains -- they should always be deep copies, not aliases. */ class Clipboard diff --git a/src/base/ColourMap.h b/src/base/ColourMap.h index 973c1e0..1cb54dc 100644 --- a/src/base/ColourMap.h +++ b/src/base/ColourMap.h @@ -111,7 +111,7 @@ public: */ bool swapItems(unsigned int item_1, unsigned int item_2); -// void replace(ColourMap &input); +// void tqreplace(ColourMap &input); /** * This returns a const iterator pointing to m_map.begin() diff --git a/src/base/Composition.cpp b/src/base/Composition.cpp index cde3a8b..7c808e1 100644 --- a/src/base/Composition.cpp +++ b/src/base/Composition.cpp @@ -102,7 +102,7 @@ Composition::ReferenceSegment::getDuration() const } Composition::ReferenceSegment::iterator -Composition::ReferenceSegment::find(Event *e) +Composition::ReferenceSegment::tqfind(Event *e) { return std::lower_bound (begin(), end(), e, ReferenceSegmentEventCmp()); @@ -116,7 +116,7 @@ Composition::ReferenceSegment::insert(Event *e) m_eventType, e->getType(), __FILE__, __LINE__); } - iterator i = find(e); + iterator i = tqfind(e); if (i != end() && (*i)->getAbsoluteTime() == e->getAbsoluteTime()) { @@ -133,7 +133,7 @@ Composition::ReferenceSegment::insert(Event *e) void Composition::ReferenceSegment::erase(Event *e) { - iterator i = find(e); + iterator i = tqfind(e); if (i != end()) Impl::erase(i); } @@ -141,7 +141,7 @@ Composition::ReferenceSegment::iterator Composition::ReferenceSegment::findTime(timeT t) { Event dummy("dummy", t, 0, MIN_SUBORDERING); - return find(&dummy); + return tqfind(&dummy); } Composition::ReferenceSegment::iterator @@ -150,7 +150,7 @@ Composition::ReferenceSegment::findRealTime(RealTime t) Event dummy("dummy", 0, 0, MIN_SUBORDERING); dummy.set<Bool>(NoAbsoluteTimeProperty, true); setTempoTimestamp(&dummy, t); - return find(&dummy); + return tqfind(&dummy); } Composition::ReferenceSegment::iterator @@ -298,7 +298,7 @@ Composition::weakDetachSegment(Segment *segment) } bool -Composition::contains(const Segment *s) +Composition::tqcontains(const Segment *s) { iterator i = findSegment(s); return (i != end()); diff --git a/src/base/Composition.h b/src/base/Composition.h index 24865dd..5a1b0ac 100644 --- a/src/base/Composition.h +++ b/src/base/Composition.h @@ -254,7 +254,7 @@ public: /** * Test whether a Segment exists in this Composition. */ - bool contains(const Segment *); + bool tqcontains(const Segment *); /** * Return an iterator pointing at the given Segment, or end() @@ -437,7 +437,7 @@ public: } /** - * Return the starting and ending times of the bar that contains + * Return the starting and ending times of the bar that tqcontains * time t. * * Will happily return theoretical timings for bars before the @@ -770,7 +770,7 @@ public: ////// // - // QUANTIZERS + // TQUANTIZERS /** * Return a quantizer that quantizes to the our most basic @@ -799,8 +799,8 @@ public: return m_refreshStatusArray.getNewRefreshStatusId(); } - RefreshStatus& getRefreshStatus(unsigned int id) { - return m_refreshStatusArray.getRefreshStatus(id); + RefreshtqStatus& getRefreshtqStatus(unsigned int id) { + return m_refreshStatusArray.getRefreshtqStatus(id); } /// Set all refresh statuses to true @@ -906,7 +906,7 @@ protected: std::string getEventType() const { return m_eventType; } private: - iterator find(Event *e); + iterator tqfind(Event *e); std::string m_eventType; }; @@ -989,7 +989,7 @@ protected: bool m_playMetronome; bool m_recordMetronome; - RefreshStatusArray<RefreshStatus> m_refreshStatusArray; + RefreshStatusArray<RefreshtqStatus> m_refreshStatusArray; // User defined markers in the composition // diff --git a/src/base/Configuration.cpp b/src/base/Configuration.cpp index a3d836f..cf633c5 100644 --- a/src/base/Configuration.cpp +++ b/src/base/Configuration.cpp @@ -171,7 +171,7 @@ const PropertyName DocumentConfiguration::TransportMode = "transportmode DocumentConfiguration::DocumentConfiguration() { set<Int>(ZoomLevel, 0); - set<String>(TransportMode, ""); // apparently generates an exception if not initialized + set<String>(TransportMode, ""); // aptqparently generates an exception if not initialized } DocumentConfiguration::DocumentConfiguration(const DocumentConfiguration &conf): diff --git a/src/base/Equation.h b/src/base/Equation.h index 61377a5..668c321 100644 --- a/src/base/Equation.h +++ b/src/base/Equation.h @@ -20,8 +20,8 @@ COPYING included with this distribution for more information. */ -#ifndef _EQUATION_H_ -#define _EQUATION_H_ +#ifndef _ETQUATION_H_ +#define _ETQUATION_H_ namespace Rosegarden { diff --git a/src/base/Event.cpp b/src/base/Event.cpp index e63e51b..c5608b7 100644 --- a/src/base/Event.cpp +++ b/src/base/Event.cpp @@ -118,7 +118,7 @@ Event::EventData::setTime(const PropertyName &name, timeT t, timeT deft) } PropertyMap * -Event::find(const PropertyName &name, PropertyMap::iterator &i) +Event::tqfind(const PropertyName &name, PropertyMap::iterator &i) { PropertyMap *map = m_data->m_properties; @@ -142,7 +142,7 @@ Event::has(const PropertyName &name) const #endif PropertyMap::const_iterator i; - const PropertyMap *map = find(name, i); + const PropertyMap *map = tqfind(name, i); if (map) return true; else return false; } @@ -156,7 +156,7 @@ Event::unset(const PropertyName &name) unshare(); PropertyMap::iterator i; - PropertyMap *map = find(name, i); + PropertyMap *map = tqfind(name, i); if (map) { delete i->second; map->erase(i); @@ -169,7 +169,7 @@ Event::getPropertyType(const PropertyName &name) const // throw (NoData) { PropertyMap::const_iterator i; - const PropertyMap *map = find(name, i); + const PropertyMap *map = tqfind(name, i); if (map) { return i->second->getType(); } else { @@ -183,7 +183,7 @@ Event::getPropertyTypeAsString(const PropertyName &name) const // throw (NoData) { PropertyMap::const_iterator i; - const PropertyMap *map = find(name, i); + const PropertyMap *map = tqfind(name, i); if (map) { return i->second->getTypeName(); } else { @@ -197,7 +197,7 @@ Event::getAsString(const PropertyName &name) const // throw (NoData) { PropertyMap::const_iterator i; - const PropertyMap *map = find(name, i); + const PropertyMap *map = tqfind(name, i); if (map) { return i->second->unparse(); } else { diff --git a/src/base/Event.h b/src/base/Event.h index f236681..987929c 100644 --- a/src/base/Event.h +++ b/src/base/Event.h @@ -363,12 +363,12 @@ private: } // returned iterator (in i) only valid if return map value is non-zero - PropertyMap *find(const PropertyName &name, PropertyMap::iterator &i); + PropertyMap *tqfind(const PropertyName &name, PropertyMap::iterator &i); - const PropertyMap *find(const PropertyName &name, + const PropertyMap *tqfind(const PropertyName &name, PropertyMap::const_iterator &i) const { PropertyMap::iterator j; - PropertyMap *map = const_cast<Event *>(this)->find(name, j); + PropertyMap *map = const_cast<Event *>(this)->tqfind(name, j); i = j; return map; } @@ -400,7 +400,7 @@ Event::get(const PropertyName &name, typename PropertyDefn<P>::basic_type &val) #endif PropertyMap::const_iterator i; - const PropertyMap *map = find(name, i); + const PropertyMap *map = tqfind(name, i); if (map) { @@ -434,7 +434,7 @@ Event::get(const PropertyName &name) const #endif PropertyMap::const_iterator i; - const PropertyMap *map = find(name, i); + const PropertyMap *map = tqfind(name, i); if (map) { @@ -464,7 +464,7 @@ Event::isPersistent(const PropertyName &name) const // throw (NoData) { PropertyMap::const_iterator i; - const PropertyMap *map = find(name, i); + const PropertyMap *map = tqfind(name, i); if (map) { return (map == m_data->m_properties); @@ -481,7 +481,7 @@ Event::setPersistence(const PropertyName &name, bool persistent) { unshare(); PropertyMap::iterator i; - PropertyMap *map = find(name, i); + PropertyMap *map = tqfind(name, i); if (map) { insert(*i, persistent); @@ -506,7 +506,7 @@ Event::set(const PropertyName &name, typename PropertyDefn<P>::basic_type value, unshare(); PropertyMap::iterator i; - PropertyMap *map = find(name, i); + PropertyMap *map = tqfind(name, i); if (map) { bool persistentBefore = (map == m_data->m_properties); @@ -547,7 +547,7 @@ Event::setMaybe(const PropertyName &name, typename PropertyDefn<P>::basic_type v unshare(); PropertyMap::iterator i; - PropertyMap *map = find(name, i); + PropertyMap *map = tqfind(name, i); if (map) { if (map == m_data->m_properties) return; // persistent, so ignore it diff --git a/src/base/Instrument.h b/src/base/Instrument.h index 8c348f0..4665486 100644 --- a/src/base/Instrument.h +++ b/src/base/Instrument.h @@ -28,7 +28,7 @@ #include "XmlExportable.h" #include "MidiProgram.h" -// An Instrument connects a Track (which itself contains +// An Instrument connects a Track (which itself tqcontains // a list of Segments) to a device that can play that // Track. // @@ -220,7 +220,7 @@ public: // virtual std::string toXmlString(); - // Get and set the parent device + // Get and set the tqparent device // Device* getDevice() const { return m_device; } void setDevice(Device* dev) { m_device = dev; } @@ -263,7 +263,7 @@ private: Device *m_device; // Do we send at this intrument or do we leave these - // things up to the parent device and God? These are + // things up to the tqparent device and God? These are // directly relatable to GUI elements // bool m_sendBankSelect; diff --git a/src/base/LayoutEngine.h b/src/base/LayoutEngine.h index 179d119..2116013 100644 --- a/src/base/LayoutEngine.h +++ b/src/base/LayoutEngine.h @@ -31,7 +31,7 @@ class TimeSignature; /** - * Base classes for layout engines. The intention is that + * Base classes for tqlayout engines. The intention is that * different sorts of renderers (piano-roll, score etc) can be * implemented by simply plugging different implementations * of Staff and LayoutEngine into a single view class. @@ -58,9 +58,9 @@ public: timeT endTime = 0) = 0; /** - * Precomputes layout data for a single staff, updating any + * Precomputes tqlayout data for a single staff, updating any * internal data stores associated with that staff and updating - * any layout-related properties in the events on the staff's + * any tqlayout-related properties in the events on the staff's * segment. * * If startTime == endTime, act on the whole staff; otherwise only @@ -71,10 +71,10 @@ public: timeT endTime = 0) = 0; /** - * Computes any layout data that may depend on the results of + * Computes any tqlayout data that may depend on the results of * scanning more than one staff. This may mean doing most of - * the layout (likely for horizontal layout) or nothing at all - * (likely for vertical layout). + * the tqlayout (likely for horizontal tqlayout) or nothing at all + * (likely for vertical tqlayout). * * If startTime == endTime, act on the whole staff; otherwise only * the given section. @@ -82,7 +82,7 @@ public: virtual void finishLayout(timeT startTime = 0, timeT endTime = 0) = 0; - unsigned int getStatus() const { return m_status; } + unsigned int gettqStatus() const { return m_status; } protected: unsigned int m_status; @@ -97,9 +97,9 @@ public: virtual ~HorizontalLayoutEngine(); /** - * Sets a page width for the layout. + * Sets a page width for the tqlayout. * - * A layout implementation does not have to use this. Some might + * A tqlayout implementation does not have to use this. Some might * use it (for example) to ensure that bar lines fall precisely at * the right-hand margin of each page. The computed x-coordinates * will still require to be wrapped into lines by the staff or diff --git a/src/base/LegatoQuantizer.h b/src/base/LegatoQuantizer.h index 645da05..fee5360 100644 --- a/src/base/LegatoQuantizer.h +++ b/src/base/LegatoQuantizer.h @@ -19,8 +19,8 @@ COPYING included with this distribution for more information. */ -#ifndef LEGATO_QUANTIZER_H -#define LEGATO_QUANTIZER_H +#ifndef LEGATO_TQUANTIZER_H +#define LEGATO_TQUANTIZER_H #include "Quantizer.h" diff --git a/src/base/MidiProgram.h b/src/base/MidiProgram.h index e44f631..a5ab7a9 100644 --- a/src/base/MidiProgram.h +++ b/src/base/MidiProgram.h @@ -168,7 +168,7 @@ private: }; -// MidiFilter is a bitmask of MappedEvent::MappedEventType. +// MidiFilter is a bittqmask of MappedEvent::MappedEventType. // Look in sound/MappedEvent.h // typedef unsigned int MidiFilter; diff --git a/src/base/NotationQuantizer.cpp b/src/base/NotationQuantizer.cpp index 9e76a94..8f4b1e7 100644 --- a/src/base/NotationQuantizer.cpp +++ b/src/base/NotationQuantizer.cpp @@ -37,7 +37,7 @@ using std::cout; using std::cerr; using std::endl; -//#define DEBUG_NOTATION_QUANTIZER 1 +//#define DEBUG_NOTATION_TQUANTIZER 1 namespace Rosegarden { @@ -83,7 +83,7 @@ public: } virtual timeT getQuantizedAbsoluteTime(const Event *e) const { timeT t = m_impl->getProvisional((Event *)e, AbsoluteTimeValue); -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "ProvisionalQuantizer::getQuantizedAbsoluteTime: returning " << t << endl; #endif return t; @@ -295,7 +295,7 @@ NotationQuantizer::Impl::quantizeAbsoluteTime(Segment *s, Segment::iterator i) c long bestScore = 0; bool bestRight = false; -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "quantizeAbsoluteTime: t is " << t << ", d is " << d << endl; #endif @@ -321,7 +321,7 @@ NotationQuantizer::Impl::quantizeAbsoluteTime(Segment *s, Segment::iterator i) c } } -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER if (n != s->end() && n != nprime) { cout << "found n (distinct from nprime) at " << (*n)->getAbsoluteTime() << endl; } @@ -340,7 +340,7 @@ NotationQuantizer::Impl::quantizeAbsoluteTime(Segment *s, Segment::iterator i) c t, d, noteType, n, nprime, right); if (depth == 0 || score < bestScore) { -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << " [*]"; #endif bestBase = base; @@ -348,13 +348,13 @@ NotationQuantizer::Impl::quantizeAbsoluteTime(Segment *s, Segment::iterator i) c bestRight = right; } -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << endl; #endif } if (bestBase == -2) { -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "Quantizer::quantizeAbsoluteTime: weirdness: no snap found" << endl; #endif } else { @@ -373,7 +373,7 @@ NotationQuantizer::Impl::quantizeAbsoluteTime(Segment *s, Segment::iterator i) c t += sigTime; -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "snap base is " << bestBase << ", snapped to " << t << endl; #endif } @@ -457,7 +457,7 @@ NotationQuantizer::Impl::scoreAbsoluteTimeForBase(Segment *s, } } -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << " depth/eff/dist/t/score/pen1/pen2/res: " << depth << "/" << effectiveDepth << "/" << distance << "/" << (right ? t + distance : t - distance) << "/" << score << "/" << penalty1 << "/" << penalty2 << "/" << (score * penalty1 * penalty2); if (right) cout << " -> "; else cout << " <- "; @@ -553,7 +553,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const Profiler profiler("NotationQuantizer::Impl::quantizeDuration"); -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "quantizeDuration: chord has " << c.size() << " notes" << endl; #endif @@ -584,7 +584,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const if ((**ci)->has(m_provisionalDuration) && (**ci)->has(BEAMED_GROUP_TUPLET_BASE)) { // dealt with already in tuplet code, we'd only mess it up here -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "not recalculating duration for tuplet" << endl; #endif continue; @@ -595,7 +595,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const if (!m_contrapuntal) { // if not contrapuntal, give all notes in chord equal duration if (nonContrapuntalDuration > 0) { -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "setting duration trivially to " << nonContrapuntalDuration << endl; #endif setProvisional(**ci, DurationValue, nonContrapuntalDuration); @@ -613,7 +613,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const timeT qt = getProvisional(**ci, AbsoluteTimeValue); -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "note at time " << (**ci)->getAbsoluteTime() << " (provisional time " << qt << ")" << endl; #endif @@ -626,7 +626,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const base /= divisions[depth]; } -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "duration is " << ud << ", probably between " << bases.first << " and " << bases.second << endl; #endif @@ -645,7 +645,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const qd = Note::getNearestNote(spaceAvailable).getDuration(); -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "non-contrapuntal segment, rounded duration down to " << qd << " (as only " << spaceAvailable << " available)" << endl; @@ -675,7 +675,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const bases.second == absTimeBase) { if (nextNoteTime >= qt + bases.second) { -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "We rounded to " << qd << " but we're on " << absTimeBase << " absTimeBase" << " and the next base is " << bases.second @@ -699,14 +699,14 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const if (note.getNoteType() < Note::Longest) { if (bases.second <= spaceAvailable) { -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "We rounded down to " << qd << " but have room for " << bases.second << ", rounding up again" << endl; #endif qd = bases.second; } else { -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "We rounded down to " << qd << "; can't fit " << bases.second << endl; #endif @@ -720,7 +720,7 @@ NotationQuantizer::Impl::quantizeDuration(Segment *s, Chord &c) const if (!m_contrapuntal) nonContrapuntalDuration = qd; } -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "totalFrac " << totalFrac << ", totalFracCount " << totalFracCount << ", avg " << (totalFracCount > 0 ? (totalFrac / totalFracCount) : 0) << endl; #endif } @@ -746,7 +746,7 @@ NotationQuantizer::Impl::scanTupletsInBar(Segment *s, if (depth >= 0) base /= divisions[depth]; if (base <= Note(Note::Semiquaver).getDuration()) break; -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "\nscanTupletsInBar: trying at depth " << depth << " (base " << base << ")" << endl; #endif @@ -766,7 +766,7 @@ NotationQuantizer::Impl::scanTupletsInBar(Segment *s, continue; } -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "scanTupletsInBar: testing " << tupletStart << "," << base << " at tuplet base " << tupletBase << endl; #endif @@ -786,7 +786,7 @@ NotationQuantizer::Impl::scanTupletsInBar(Segment *s, } if (jTime >= tupletEnd) { // nothing to make tuplets of -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "scanTupletsInBar: nothing here" << endl; #endif tupletStart = tupletEnd; @@ -827,14 +827,14 @@ NotationQuantizer::Impl::scanTupletsAt(Segment *s, if (!(*j)->isa(Note::EventType)) { ++j; continue; } -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "scanTupletsAt time " << jTime << " (unquantized " << (*j)->getAbsoluteTime() << "), found note" << endl; #endif // reject any group containing anything already a tuplet if ((*j)->has(BEAMED_GROUP_TUPLET_BASE)) { -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "already made tuplet here" << endl; #endif return; @@ -843,19 +843,19 @@ NotationQuantizer::Impl::scanTupletsAt(Segment *s, timeT originalBase; if (!(*j)->get<Int>(m_provisionalBase, originalBase)) { -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "some notes not provisionally quantized, no good" << endl; #endif return; } if (originalBase == base) { -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "accepting note at original base" << endl; #endif candidates.push_back(*j); } else if (((jTime - sigTime) % base) == 0) { -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "accepting note that happens to lie on original base" << endl; #endif candidates.push_back(*j); @@ -867,7 +867,7 @@ NotationQuantizer::Impl::scanTupletsAt(Segment *s, // any of the likelihood tests for tuplets. if (!isValidTupletAt(s, j, depth, base, sigTime, tupletBase)) { -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "no good" << endl; #endif return; @@ -883,13 +883,13 @@ NotationQuantizer::Impl::scanTupletsAt(Segment *s, // must have at least one note that is not already quantized to the // original base if (count < 1) { -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "scanTupletsAt: found no note not already quantized to " << base << endl; #endif return; } -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "scanTupletsAt: Tuplet group of duration " << base << " starting at " << tupletStart << endl; #endif @@ -970,7 +970,7 @@ NotationQuantizer::Impl::isValidTupletAt(Segment *s, timeT ud = m_q->getFromSource(*i, DurationValue); if (ud > (tupletBase * 5 / 4)) { -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "\nNotationQuantizer::isValidTupletAt: note too long at " << (*i)->getDuration() << " (tupletBase is " << tupletBase << ")" << endl; @@ -981,7 +981,7 @@ NotationQuantizer::Impl::isValidTupletAt(Segment *s, //!!! This bit is a cop-out. It means we reject anything that looks // like it's going to have rests in it. Bah. if (ud <= (tupletBase * 3 / 8)) { -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "\nNotationQuantizer::isValidTupletAt: note too short at " << (*i)->getDuration() << " (tupletBase is " << tupletBase << ")" << endl; @@ -1000,7 +1000,7 @@ NotationQuantizer::Impl::isValidTupletAt(Segment *s, bool dummy; long tupletScore = scoreAbsoluteTimeForBase (s, i, depth, tupletBase, sigTime, t, d, noteType, s->end(), s->end(), dummy); -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "\nNotationQuantizer::isValidTupletAt: score " << score << " vs tupletScore " << tupletScore << endl; #endif @@ -1027,7 +1027,7 @@ NotationQuantizer::Impl::quantizeRange(Segment *s, int events = 0, notes = 0, passes = 0; int setGood = 0, setBad = 0; -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "NotationQuantizer::Impl::quantizeRange: from time " << (from == s->end() ? -1 : (*from)->getAbsoluteTime()) << " to " @@ -1177,7 +1177,7 @@ NotationQuantizer::Impl::quantizeRange(Segment *s, (*i)->getDuration() == d) ++setBad; else ++setGood; -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "Setting to target at " << t << "," << d << endl; #endif diff --git a/src/base/NotationQuantizer.h b/src/base/NotationQuantizer.h index 87b0d72..02c1c59 100644 --- a/src/base/NotationQuantizer.h +++ b/src/base/NotationQuantizer.h @@ -19,8 +19,8 @@ COPYING included with this distribution for more information. */ -#ifndef NOTATION_QUANTIZER_H_ -#define NOTATION_QUANTIZER_H_ +#ifndef NOTATION_TQUANTIZER_H_ +#define NOTATION_TQUANTIZER_H_ #include "Quantizer.h" diff --git a/src/base/Quantizer.cpp b/src/base/Quantizer.cpp index c0e4d1b..7b90c61 100644 --- a/src/base/Quantizer.cpp +++ b/src/base/Quantizer.cpp @@ -37,7 +37,7 @@ using std::cout; using std::cerr; using std::endl; -//#define DEBUG_NOTATION_QUANTIZER 1 +//#define DEBUG_NOTATION_TQUANTIZER 1 namespace Rosegarden { @@ -366,7 +366,7 @@ Quantizer::setToTarget(Segment *s, Segment::iterator i, // that are already being referred to in ViewElementLists, // preventing us from locating them in the ViewElementLists // because their ordering would have silently changed -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "Quantizer: setting " << absTime << " to notation absolute time and " << duration << " to notation duration" << endl; @@ -404,7 +404,7 @@ Quantizer::setToTarget(Segment *s, Segment::iterator i, m_toInsert.push_back(e); } -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "m_toInsert.size() is now " << m_toInsert.size() << endl; #endif } @@ -464,7 +464,7 @@ Quantizer::insertNewEvents(Segment *s) const s->insert(m_toInsert[i]); } -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "Quantizer::insertNewEvents: sz is " << sz << ", minTime " << minTime << ", maxTime " << maxTime << endl; @@ -482,7 +482,7 @@ Quantizer::insertNewEvents(Segment *s) const } } -#ifdef DEBUG_NOTATION_QUANTIZER +#ifdef DEBUG_NOTATION_TQUANTIZER cout << "Quantizer: calling normalizeRests(" << minTime << ", " << maxTime << ")" << endl; #endif diff --git a/src/base/Quantizer.h b/src/base/Quantizer.h index 407b651..035299c 100644 --- a/src/base/Quantizer.h +++ b/src/base/Quantizer.h @@ -19,8 +19,8 @@ COPYING included with this distribution for more information. */ -#ifndef QUANTIZER_H -#define QUANTIZER_H +#ifndef TQUANTIZER_H +#define TQUANTIZER_H #include "Segment.h" #include "Event.h" diff --git a/src/base/RefreshStatus.h b/src/base/RefreshStatus.h index 4c39a18..f64a72c 100644 --- a/src/base/RefreshStatus.h +++ b/src/base/RefreshStatus.h @@ -26,10 +26,10 @@ namespace Rosegarden { -class RefreshStatus +class RefreshtqStatus { public: - RefreshStatus() : m_needsRefresh(true) {} + RefreshtqStatus() : m_needsRefresh(true) {} bool needsRefresh() { return m_needsRefresh; } void setNeedsRefresh(bool s) { m_needsRefresh = s; } @@ -44,7 +44,7 @@ class RefreshStatusArray public: unsigned int getNewRefreshStatusId(); size_t size() { return m_refreshStatuses.size(); } - RS& getRefreshStatus(unsigned int id) { return m_refreshStatuses[id]; } + RS& getRefreshtqStatus(unsigned int id) { return m_refreshStatuses[id]; } void updateRefreshStatuses(); protected: diff --git a/src/base/Segment.cpp b/src/base/Segment.cpp index 2f65acd..c8e3018 100644 --- a/src/base/Segment.cpp +++ b/src/base/Segment.cpp @@ -352,7 +352,7 @@ void Segment::updateRefreshStatuses(timeT startTime, timeT endTime) { for(unsigned int i = 0; i < m_refreshStatusArray.size(); ++i) - m_refreshStatusArray.getRefreshStatus(i).push(startTime, endTime); + m_refreshStatusArray.getRefreshtqStatus(i).push(startTime, endTime); } @@ -1269,7 +1269,7 @@ SegmentHelper::~SegmentHelper() { } void -SegmentRefreshStatus::push(timeT from, timeT to) +SegmentRefreshtqStatus::push(timeT from, timeT to) { if (!needsRefresh()) { // don't do anything subtle - just erase the old data diff --git a/src/base/Segment.h b/src/base/Segment.h index 564d118..ac6e092 100644 --- a/src/base/Segment.h +++ b/src/base/Segment.h @@ -37,10 +37,10 @@ namespace Rosegarden { -class SegmentRefreshStatus : public RefreshStatus +class SegmentRefreshtqStatus : public RefreshtqStatus { public: - SegmentRefreshStatus() : m_from(0), m_to(0) {} + SegmentRefreshtqStatus() : m_from(0), m_to(0) {} void push(timeT from, timeT to); @@ -283,7 +283,7 @@ public: ////// // - // QUANTIZATION + // TQUANTIZATION /** * Switch quantization on or off. @@ -616,8 +616,8 @@ public: return m_refreshStatusArray.getNewRefreshStatusId(); } - SegmentRefreshStatus &getRefreshStatus(unsigned int id) { - return m_refreshStatusArray.getRefreshStatus(id); + SegmentRefreshtqStatus &getRefreshtqStatus(unsigned int id) { + return m_refreshStatusArray.getRefreshtqStatus(id); } void updateRefreshStatuses(timeT startTime, timeT endTime); @@ -657,7 +657,7 @@ private: int m_highestPlayable; // suggestion for highest playable note (notation) int m_lowestPlayable; // suggestion for lowest playable note (notation) - RefreshStatusArray<SegmentRefreshStatus> m_refreshStatusArray; + RefreshStatusArray<SegmentRefreshtqStatus> m_refreshStatusArray; struct ClefKeyCmp { bool operator()(const Event *e1, const Event *e2) const; diff --git a/src/base/SegmentNotationHelper.cpp b/src/base/SegmentNotationHelper.cpp index a6c8ab8..c942cf4 100644 --- a/src/base/SegmentNotationHelper.cpp +++ b/src/base/SegmentNotationHelper.cpp @@ -953,7 +953,7 @@ SegmentNotationHelper::insertSomething(iterator i, int duration, if (needToSplit) { //!!! This is not quite right for rests. Because they - //replace (rather than chording with) any events already + //tqreplace (rather than chording with) any events already //present, they don't need to be split in the case where //their duration spans several note-events. Worry about //that later, I guess. We're actually getting enough @@ -1125,7 +1125,7 @@ SegmentNotationHelper::deleteNote(Event *e, bool collapseRest) // or start after this one starts but before it ends, then we go // for the delete-event-and-normalize-rests option. Otherwise // (the notationally simpler case) we go for the - // replace-note-by-rest option. We still lose in the case where + // tqreplace-note-by-rest option. We still lose in the case where // another note starts before this one, overlaps it, but then also // ends before it does -- but I think we can live with that. @@ -1767,7 +1767,7 @@ SegmentNotationHelper::removeRests(timeT time, timeT &duration, bool testOnly) segment().erase(from, to); // we must defer calling makeRestViable() until after erase, - // because it will invalidate 'to' + // because it will tqinvalidate 'to' // if (checkLastRest) makeRestViable(lastEvent); diff --git a/src/base/SegmentNotationHelper.h b/src/base/SegmentNotationHelper.h index 5094929..ed8abf1 100644 --- a/src/base/SegmentNotationHelper.h +++ b/src/base/SegmentNotationHelper.h @@ -188,7 +188,7 @@ public: * * @return iterator pointing at the last inserted event. Also * modifies from to point at the first split event (the original - * iterator would have been invalidated). + * iterator would have been tqinvalidated). */ iterator splitIntoTie(iterator &from, iterator to, timeT baseDuration); @@ -205,7 +205,7 @@ public: * * @return iterator pointing at the last inserted event. Also * modifies i to point at the first split event (the original - * iterator would have been invalidated). + * iterator would have been tqinvalidated). */ iterator splitIntoTie(iterator &i, timeT baseDuration); diff --git a/src/base/Selection.cpp b/src/base/Selection.cpp index 6e5ca2f..3402915 100644 --- a/src/base/Selection.cpp +++ b/src/base/Selection.cpp @@ -99,7 +99,7 @@ void EventSelection::addEvent(Event *e) timeT eventDuration = e->getDuration(); if (eventDuration == 0) eventDuration = 1; - if (contains(e)) return; + if (tqcontains(e)) return; if (e->getAbsoluteTime() < m_beginTime || !m_haveRealStartTime) { m_beginTime = e->getAbsoluteTime(); @@ -115,7 +115,7 @@ void EventSelection::addFromSelection(EventSelection *sel) { for (eventcontainer::iterator i = sel->getSegmentEvents().begin(); i != sel->getSegmentEvents().end(); ++i) { - if (!contains(*i)) addEvent(*i); + if (!tqcontains(*i)) addEvent(*i); } } @@ -134,7 +134,7 @@ void EventSelection::removeEvent(Event *e) } } -bool EventSelection::contains(Event *e) const +bool EventSelection::tqcontains(Event *e) const { std::pair<eventcontainer::const_iterator, eventcontainer::const_iterator> interval = m_segmentEvents.equal_range(e); @@ -148,7 +148,7 @@ bool EventSelection::contains(Event *e) const return false; } -bool EventSelection::contains(const std::string &type) const +bool EventSelection::tqcontains(const std::string &type) const { for (eventcontainer::const_iterator i = m_segmentEvents.begin(); i != m_segmentEvents.end(); ++i) { @@ -173,13 +173,13 @@ EventSelection::getRanges() const while (j != k) { - for (j = i; j != k && contains(*j); ++j); + for (j = i; j != k && tqcontains(*j); ++j); if (j != i) { ranges.push_back(RangeList::value_type(i, j)); } - for (i = j; i != k && !contains(*i); ++i); + for (i = j; i != k && !tqcontains(*i); ++i); j = i; } @@ -210,7 +210,7 @@ EventSelection::getRangeTimes() const void EventSelection::eventRemoved(const Segment *s, Event *e) { - if (s == &m_originalSegment /*&& contains(e)*/) { + if (s == &m_originalSegment /*&& tqcontains(e)*/) { removeEvent(e); } } diff --git a/src/base/Selection.h b/src/base/Selection.h index 93ce4b4..c0a3c7b 100644 --- a/src/base/Selection.h +++ b/src/base/Selection.h @@ -82,13 +82,13 @@ public: * Test whether a given Event (in the Segment) is part of * this selection. */ - bool contains(Event *e) const; + bool tqcontains(Event *e) const; /** * Return true if there are any events of the given type in * this selection. Slow. */ - bool contains(const std::string &eventType) const; + bool tqcontains(const std::string &eventType) const; /** * Return the time at which the first Event in the selection diff --git a/src/base/Sets.h b/src/base/Sets.h index 4fe14d1..9884207 100644 --- a/src/base/Sets.h +++ b/src/base/Sets.h @@ -103,7 +103,7 @@ public: Iterator getHighestNote() const { return m_highest; } Iterator getLowestNote() const { return m_lowest; } - virtual bool contains(const Iterator &) const = 0; + virtual bool tqcontains(const Iterator &) const = 0; /// Return the pointed-to element, in Event form (public to work around gcc-2.95 bug) static Event *getAsEvent(const Iterator &i); @@ -175,7 +175,7 @@ public: virtual int getMarkCountForChord() const; virtual std::vector<Mark> getMarksForChord() const; virtual std::vector<int> getPitches() const; - virtual bool contains(const Iterator &) const; + virtual bool tqcontains(const Iterator &) const; /** * Return an iterator pointing to the previous note before this @@ -622,7 +622,7 @@ GenericChord<Element, Container, singleStaff>::getPitches() const template <class Element, class Container, bool singleStaff> bool -GenericChord<Element, Container, singleStaff>::contains(const Iterator &itr) const +GenericChord<Element, Container, singleStaff>::tqcontains(const Iterator &itr) const { for (typename std::vector<typename Container::iterator>::const_iterator i = std::vector<typename Container::iterator>::begin(); diff --git a/src/base/TriggerSegment.cpp b/src/base/TriggerSegment.cpp index c4c29de..bcf6888 100644 --- a/src/base/TriggerSegment.cpp +++ b/src/base/TriggerSegment.cpp @@ -47,7 +47,7 @@ TriggerSegmentRec::TriggerSegmentRec(TriggerSegmentId id, m_defaultRetune(retune) { if (m_defaultTimeAdjust == "") { - m_defaultTimeAdjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH; + m_defaultTimeAdjust = BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH; } calculateBases(); diff --git a/src/base/ViewElement.cpp b/src/base/ViewElement.cpp index 425bdc1..c62aef5 100644 --- a/src/base/ViewElement.cpp +++ b/src/base/ViewElement.cpp @@ -29,8 +29,8 @@ namespace Rosegarden extern const int MIN_SUBORDERING; ViewElement::ViewElement(Event *e) : - m_layoutX(0.0), - m_layoutY(0.0), + m_tqlayoutX(0.0), + m_tqlayoutY(0.0), m_event(e) { // nothing diff --git a/src/base/ViewElement.h b/src/base/ViewElement.h index 8cc3d09..f898e51 100644 --- a/src/base/ViewElement.h +++ b/src/base/ViewElement.h @@ -53,33 +53,33 @@ public: /** * Returns the X coordinate of the element, as computed by the - * layout. This is not the coordinate of the associated canvas + * tqlayout. This is not the coordinate of the associated canvas * item. * * @see getCanvasX() */ - virtual double getLayoutX() const { return m_layoutX; } + virtual double getLayoutX() const { return m_tqlayoutX; } /** * Returns the Y coordinate of the element, as computed by the - * layout. This is not the coordinate of the associated canvas + * tqlayout. This is not the coordinate of the associated canvas * item. * * @see getCanvasY() */ - virtual double getLayoutY() const { return m_layoutY; } + virtual double getLayoutY() const { return m_tqlayoutY; } /** - * Sets the X coordinate which was computed by the layout engine + * Sets the X coordinate which was computed by the tqlayout engine * @see getLayoutX() */ - virtual void setLayoutX(double x) { m_layoutX = x; } + virtual void setLayoutX(double x) { m_tqlayoutX = x; } /** - * Sets the Y coordinate which was computed by the layout engine + * Sets the Y coordinate which was computed by the tqlayout engine * @see getLayoutY() */ - virtual void setLayoutY(double y) { m_layoutY = y; } + virtual void setLayoutY(double y) { m_tqlayoutY = y; } void dump(std::ostream&) const; @@ -88,8 +88,8 @@ public: protected: ViewElement(Event *); - double m_layoutX; - double m_layoutY; + double m_tqlayoutX; + double m_tqlayoutY; Event *m_event; }; diff --git a/src/base/test/seq/complainer.c b/src/base/test/seq/complainer.c index afe0a7f..2f74eb7 100644 --- a/src/base/test/seq/complainer.c +++ b/src/base/test/seq/complainer.c @@ -12,7 +12,7 @@ callback(snd_seq_t *handle) do { if (snd_seq_event_input(handle, &ev) > 0) { - if (ev->type == SND_SEQ_EVENT_NOTEON) { + if (ev->type == SND_SETQ_EVENT_NOTEON) { struct timeval tv; static long last_usec = 0; @@ -40,7 +40,7 @@ main(int argc, char **argv) struct pollfd *pfd; struct sched_param param; - if (snd_seq_open(&handle, "hw", SND_SEQ_OPEN_DUPLEX, 0) < 0) { + if (snd_seq_open(&handle, "hw", SND_SETQ_OPEN_DUPLEX, 0) < 0) { fprintf(stderr, "failed to open ALSA sequencer interface\n"); return 1; } @@ -49,7 +49,7 @@ main(int argc, char **argv) if ((portid = snd_seq_create_simple_port (handle, "complainer", - SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE, 0)) < 0) { + SND_SETQ_PORT_CAP_WRITE | SND_SETQ_PORT_CAP_SUBS_WRITE, 0)) < 0) { fprintf(stderr, "failed to create ALSA sequencer port\n"); return 1; } diff --git a/src/base/test/seq/generator.c b/src/base/test/seq/generator.c index 9f64d61..3b7ea72 100644 --- a/src/base/test/seq/generator.c +++ b/src/base/test/seq/generator.c @@ -23,7 +23,7 @@ main(int argc, char **argv) } target = atoi(argv[1]); - if (snd_seq_open(&handle, "hw", SND_SEQ_OPEN_DUPLEX, 0) < 0) { + if (snd_seq_open(&handle, "hw", SND_SETQ_OPEN_DUPLEX, 0) < 0) { fprintf(stderr, "failed to open ALSA sequencer interface\n"); return 1; } @@ -32,7 +32,7 @@ main(int argc, char **argv) if ((portid = snd_seq_create_simple_port (handle, "generator", - SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ, 0)) < 0) { + SND_SETQ_PORT_CAP_READ | SND_SETQ_PORT_CAP_SUBS_READ, 0)) < 0) { fprintf(stderr, "failed to create ALSA sequencer port\n"); return 1; } diff --git a/src/base/test/seq/queue-timer-jack.c b/src/base/test/seq/queue-timer-jack.c index 2648e94..8a2cb55 100644 --- a/src/base/test/seq/queue-timer-jack.c +++ b/src/base/test/seq/queue-timer-jack.c @@ -63,7 +63,7 @@ main(int argc, char **argv) sample_rate = jack_get_sample_rate(jclient); - if (snd_seq_open(&handle, "hw", SND_SEQ_OPEN_DUPLEX, 0) < 0) { + if (snd_seq_open(&handle, "hw", SND_SETQ_OPEN_DUPLEX, 0) < 0) { fprintf(stderr, "failed to open ALSA sequencer interface\n"); return 1; } @@ -72,7 +72,7 @@ main(int argc, char **argv) if ((portid = snd_seq_create_simple_port (handle, "generator", - SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ, 0)) < 0) { + SND_SETQ_PORT_CAP_READ | SND_SETQ_PORT_CAP_SUBS_READ, 0)) < 0) { fprintf(stderr, "failed to create ALSA sequencer port\n"); return 1; } diff --git a/src/base/test/seq/queue-timer.c b/src/base/test/seq/queue-timer.c index 2b7bac4..1d4ae30 100644 --- a/src/base/test/seq/queue-timer.c +++ b/src/base/test/seq/queue-timer.c @@ -32,7 +32,7 @@ main(int argc, char **argv) snd_seq_queue_timer_t *timer; snd_timer_id_t *timerid; - if (snd_seq_open(&handle, "hw", SND_SEQ_OPEN_DUPLEX, 0) < 0) { + if (snd_seq_open(&handle, "hw", SND_SETQ_OPEN_DUPLEX, 0) < 0) { fprintf(stderr, "failed to open ALSA sequencer interface\n"); return 1; } @@ -41,7 +41,7 @@ main(int argc, char **argv) if ((portid = snd_seq_create_simple_port (handle, "generator", - SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ, 0)) < 0) { + SND_SETQ_PORT_CAP_READ | SND_SETQ_PORT_CAP_SUBS_READ, 0)) < 0) { fprintf(stderr, "failed to create ALSA sequencer port\n"); return 1; } |