vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

getters - use them!

Browse Source
This commit is contained in:
Erik Faye-Lund 2008-02-19 00:03:12 +00:00
parent ff614fbbb9
commit 7f8b12890a
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editor/syncdocument.h
View File

@ -82,19 +82,17 @@ public:
virtual void exec(SyncDocument *data) virtual void exec(SyncDocument *data)
{ {
sync::Track *t = data->actualTracks[this->track]; sync::Track &t = data->getTrack(this->track);
assert(NULL != t); assert(!t.isKeyFrame(row));
assert(!t->isKeyFrame(row)); t.setKeyFrame(row, key);
t->setKeyFrame(row, key);
data->sendSetKeyCommand(track, row, key); // update clients data->sendSetKeyCommand(track, row, key); // update clients
} }
virtual void undo(SyncDocument *data) virtual void undo(SyncDocument *data)
{ {
sync::Track *t = data->actualTracks[this->track]; sync::Track &t = data->getTrack(this->track);
assert(NULL != t); assert(t.isKeyFrame(row));
assert(t->isKeyFrame(row)); t.deleteKeyFrame(row);
t->deleteKeyFrame(row);
data->sendDeleteKeyCommand(track, row); // update clients data->sendDeleteKeyCommand(track, row); // update clients
} }

2
editor/trackview.cpp
View File

@ -220,7 +220,7 @@ void TrackView::paintTracks(HDC hdc, RECT rcTracks)
{ {
assert(trackIter != document->tracks.end()); assert(trackIter != document->tracks.end());
size_t trackIndex = trackIter->second; size_t trackIndex = trackIter->second;
const sync::Track &t = *document->actualTracks[trackIndex]; const sync::Track &t = document->getTrack(trackIndex);
if (track < firstTrack) continue; if (track < firstTrack) continue;
for (int row = firstRow; row <= lastRow; ++row) for (int row = firstRow; row <= lastRow; ++row)

2
sync/data.cpp
View File

@ -23,7 +23,6 @@ size_t Data::getTrackIndex(const std::basic_string<TCHAR> &name)
Track &Data::getTrack(const std::basic_string<TCHAR> &name) Track &Data::getTrack(const std::basic_string<TCHAR> &name)
{ {
size_t index = getTrackIndex(name); size_t index = getTrackIndex(name);
assert(index >= 0);
assert(index < int(actualTracks.size())); assert(index < int(actualTracks.size()));
assert(NULL != actualTracks[index]); assert(NULL != actualTracks[index]);
return *actualTracks[index]; return *actualTracks[index];
@ -31,7 +30,6 @@ Track &Data::getTrack(const std::basic_string<TCHAR> &name)
size_t Data::getTrackIndexFromPos(size_t track) size_t Data::getTrackIndexFromPos(size_t track)
{ {
assert(track >= 0);
assert(track < tracks.size()); assert(track < tracks.size());
sync::Data::TrackContainer::iterator trackIter = tracks.begin(); sync::Data::TrackContainer::iterator trackIter = tracks.begin();

6
sync/device_client.cpp
View File

@ -193,10 +193,8 @@ void ClientDevice::saveTracks()
size_t index = iter->second; size_t index = iter->second;
assert(index < syncData.getTrackCount()); assert(index < syncData.getTrackCount());
sync::Track *track = syncData.actualTracks[index]; const sync::Track &track = syncData.getTrack(index);
saveTrack(track, getTrackFileName(iter->first));
assert(NULL != track);
saveTrack(*track, getTrackFileName(iter->first));
} }
} }