Skip to content

lass, cmod: replace Collection with std::vector #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
passyur merged 1 commit into from
Jun 8, 2026
Merged

lass, cmod: replace Collection with std::vector #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMOD/src/FileValue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@
// }

// // create the collection of points
// Collection<xy_point> points;
// vector<xy_point> points;
// list<FileValue>::iterator xIter = xPoints->begin();
// list<FileValue>::iterator yIter = yPoints->begin();

Expand Down Expand Up @@ -831,7 +831,7 @@
// }

// // create the collection of segments
// Collection<envelope_segment> segments;
// vector<envelope_segment> segments;
// list<FileValue>::iterator interpIter = interpTypes->begin();
// list<FileValue>::iterator ffIter = flexOrFix->begin();

Expand Down
2 changes: 1 addition & 1 deletion CMOD/src/Matrix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ class Matrix {
// void Envelopes(vector<Envelope*> envList);
/*
void Envelopes(vector<float> probs, vector<Envelope*> envList)
void Envelopes(vector<Collection<xy_point> > xyCollection,
void Envelopes(vector<vector<xy_point> > xyCollection,
vector<vector<string> > segmentTypes,
vector<vector<string> > segmentFixed);
*/
Expand Down
8 changes: 4 additions & 4 deletions CMOD/src/Utilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1945,7 +1945,7 @@ Envelope* Utilities::makeEnvelope(pugi::xml_node _functionElement, void* _object
double scale = evaluate(XMLTranscode(GNES(_functionElement)), _object);

// create the collection of points
Collection<xy_point> points;
vector<xy_point> points;


float prevYVal = 0;
Expand All @@ -1964,14 +1964,14 @@ Envelope* Utilities::makeEnvelope(pugi::xml_node _functionElement, void* _object
prevXVal = xy.x;
prevYVal = xy.y;

points.add(xy);
points.push_back(xy);
x = GNES(x);
y = GNES(y);

}

// create the collection of segments
Collection<envelope_segment> segments;
vector<envelope_segment> segments;
while (t!=NULL && p!=NULL) {
envelope_segment seg;

Expand Down Expand Up @@ -2000,7 +2000,7 @@ Envelope* Utilities::makeEnvelope(pugi::xml_node _functionElement, void* _object
exit(1);
}

segments.add(seg);
segments.push_back(seg);

t = GNES(t);
p = GNES(p);
Expand Down
1 change: 0 additions & 1 deletion LASS/src/AllPassFilter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//----------------------------------------------------------------------------//

#include "SoundSample.h"
#include "Collection.h"
#include "Track.h"
#include "MultiTrack.h"
#include "Filter.h"
Expand Down
1 change: 0 additions & 1 deletion LASS/src/AllPassFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "StandardHeaders.h"

#include "SoundSample.h"
#include "Collection.h"
#include "Track.h"
#include "MultiTrack.h"
#include "LowPassFilter.h"
Expand Down
10 changes: 4 additions & 6 deletions LASS/src/AuWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,9 @@ bool AuWriter::write(MultiTrack& mt, string filename, int bits)
{
vector<SoundSample*> channels;

Iterator<Track*> it = mt.iterator();
while (it.hasNext())
for (Track* track : mt)
{
channels.push_back(& it.next()->getWave());
channels.push_back(& track->getWave());
}

return write(channels, filename, bits);
Expand All @@ -71,12 +70,11 @@ bool AuWriter::write_one_per_track(MultiTrack& mt, char *filename, ...)

bool ret_val = true;
char *cur_filename = filename;
Iterator<Track*> it = mt.iterator();

va_start(marker, filename);
while (it.hasNext())
for (Track* track : mt)
{
channels.push_back(& it.next()->getWave());
channels.push_back(& track->getWave());
ret_val = ret_val & write(channels, string(cur_filename));
channels.pop_back();
cur_filename = va_arg(marker, char *);
Expand Down
1 change: 0 additions & 1 deletion LASS/src/BiQuadFilter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <math.h>
#include <stdlib.h>
#include "SoundSample.h"
#include "Collection.h"
#include "Track.h"
#include "MultiTrack.h"
#include "Filter.h"
Expand Down
1 change: 0 additions & 1 deletion LASS/src/BiQuadFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//----------------------------------------------------------------------------//

#include "SoundSample.h"
#include "Collection.h"
#include "Track.h"
#include "MultiTrack.h"
#include "Filter.h"
Expand Down
253 changes: 0 additions & 253 deletions LASS/src/Collection.cpp
View file
Open in desktop

This file was deleted.

Loading
Loading