projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ffmpeg versioning mods from Andrew
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
transportque.C
diff --git
a/cinelerra-5.1/cinelerra/transportque.C
b/cinelerra-5.1/cinelerra/transportque.C
index a8c1fb9297b065c1000afa793c2cc6f9f5046f4a..5048beaf73cc42520323514b38255f4b324bcf2e 100644
(file)
--- a/
cinelerra-5.1/cinelerra/transportque.C
+++ b/
cinelerra-5.1/cinelerra/transportque.C
@@
-26,10
+26,12
@@
#include "edlsession.h"
#include "localsession.h"
#include "playbackengine.h"
#include "edlsession.h"
#include "localsession.h"
#include "playbackengine.h"
+#include "preferences.h"
#include "tracks.h"
#include "transportque.h"
#include "tracks.h"
#include "transportque.h"
-TransportCommand::TransportCommand()
+
+TransportCommand::TransportCommand(Preferences *preferences)
{
// In rendering we want a master EDL so settings don't get clobbered
// in the middle of a job.
{
// In rendering we want a master EDL so settings don't get clobbered
// in the middle of a job.
@@
-37,6
+39,7
@@
TransportCommand::TransportCommand()
edl->create_objects();
command = 0;
change_type = 0;
edl->create_objects();
command = 0;
change_type = 0;
+ this->preferences = preferences;
reset();
}
reset();
}
@@
-134,10
+137,16
@@
int TransportCommand::get_direction(int command)
float TransportCommand::get_speed(int command, float speed)
{
float TransportCommand::get_speed(int command, float speed)
{
+// fast = 2.0, slow = 0.5
+// float my_fast_speed = 2.0;
+// float my_slow_speed = 0.5;
+float my_fast_speed = preferences->fast_speed;
+float my_slow_speed = preferences->slow_speed;
+
switch(command) {
case SLOW_FWD:
case SLOW_REWIND:
switch(command) {
case SLOW_FWD:
case SLOW_REWIND:
- return speed ? speed :
0.5
;
+ return speed ? speed :
my_slow_speed
;
case NORMAL_FWD:
case NORMAL_REWIND:
case NORMAL_FWD:
case NORMAL_REWIND:
@@
-149,7
+158,7
@@
float TransportCommand::get_speed(int command, float speed)
case FAST_FWD:
case FAST_REWIND:
case FAST_FWD:
case FAST_REWIND:
- return speed ? speed :
2.
;
+ return speed ? speed :
my_fast_speed
;
}
return 0.;
}
return 0.;