matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

While appending streams, the streamId and ordinalId were getting overwritten. Port::newStreamAt() now takes an additional parameter - pointer to stream (default NULL) which is used when appending streams

Browse Source 
Fixes Issue 21
This commit is contained in:
Srivats P. 2010-10-25 19:27:23 +05:30
parent 90fda499dd
commit 3aac690ed8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/port.cpp
View File

@ -65,13 +65,16 @@ void Port::reorderStreamsByOrdinals()
qSort(mStreams.begin(), mStreams.end(), StreamBase::StreamLessThan); qSort(mStreams.begin(), mStreams.end(), StreamBase::StreamLessThan);
} }
bool Port::newStreamAt(int index) bool Port::newStreamAt(int index, OstProto::Stream const *stream)
{ {
Stream *s = new Stream; Stream *s = new Stream;
if (index > mStreams.size()) if (index > mStreams.size())
return false; return false;
if (stream)
s->protoDataCopyFrom(*stream);
s->setId(newStreamId()); s->setId(newStreamId());
mStreams.insert(index, s); mStreams.insert(index, s);
updateStreamOrdinalsFromIndex(); updateStreamOrdinalsFromIndex();
@ -235,8 +238,7 @@ bool Port::openStreams(QString fileName, bool append, QString &error)
for (int i = 0; i < streams.stream_size(); i++) for (int i = 0; i < streams.stream_size(); i++)
{ {
newStreamAt(mStreams.size()); newStreamAt(mStreams.size(), &streams.stream(i));
streamByIndex(mStreams.size()-1)->protoDataCopyFrom(streams.stream(i));
} }
emit streamListChanged(mPortGroupId, mPortId); emit streamListChanged(mPortGroupId, mPortId);

2
client/port.h
View File

@ -99,7 +99,7 @@ public:
//! Used by StreamModel //! Used by StreamModel
//@{ //@{
bool newStreamAt(int index); bool newStreamAt(int index, OstProto::Stream const *stream = NULL);
bool deleteStreamAt(int index); bool deleteStreamAt(int index);
//@} //@}