ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix minor problems after merge

Browse source
This commit is contained in:
Fischlurch 2011-10-21 00:58:15 +02:00
parent c06c49e782
commit f1a4489470
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/widgets/timeline/timeline-state.cpp
View file

@ -51,7 +51,9 @@ TimelineState::TimelineState (boost::shared_ptr<model::Sequence> source_sequence
REQUIRE(sequence);
////////////////////////////////////////////////////////////TICKET #798: how to handle GUI default state
viewWindow.set_time_scale(21000000);
const int64_t DEFAULT_TIMELINE_SCALE =21000000;
viewWindow.set_time_scale(DEFAULT_TIMELINE_SCALE);
setSelection (Mutation::changeTime (Time(FSecs(2))));
setSelection (Mutation::changeDuration(Duration(FSecs(2))));

2
tests/components/proc/control/command-argument-test.cpp
View file

@ -244,7 +244,7 @@ namespace test {
arg3->storeTuple (tuple::make (rand() % 10, TimeVar(randTime())));
arg4->storeTuple (tuple::make (rand() % 10, TimeVar(randTime())));
arg5->storeTuple (tuple::make (TTime (randTime()), Tstr("glorious"), rand() % 25));
arg5->storeTuple (tuple::make (TTime (randTime()), Tstr("glorious"), 10 + rand() % 90));
CHECK (!arg5->canUndo());