X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftransportque.C;h=96645929df3fcdf1e52d6fb0a6daf9d20abb2e37;hb=bd7011a86f60b4ef1abf11e2667373eba3a98c99;hp=a8c1fb9297b065c1000afa793c2cc6f9f5046f4a;hpb=f1fc28e0bbb5a7c0e153ef9c1abdbfb1186e1acc;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/transportque.C b/cinelerra-5.1/cinelerra/transportque.C
index a8c1fb92..96645929 100644
--- a/cinelerra-5.1/cinelerra/transportque.C
+++ b/cinelerra-5.1/cinelerra/transportque.C
@@ -2,6 +2,7 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,10 +27,12 @@
 #include "edlsession.h"
 #include "localsession.h"
 #include "playbackengine.h"
+#include "preferences.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.
@@ -37,6 +40,7 @@ TransportCommand::TransportCommand()
 	edl->create_objects();
 	command = 0;
 	change_type = 0;
+	this->preferences = preferences;
 	reset();
 }
 
@@ -134,10 +138,16 @@ int TransportCommand::get_direction(int command)
 
 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:
-		return speed ? speed : 0.5;
+		return speed ? speed : my_slow_speed;
 
 	case NORMAL_FWD:
 	case NORMAL_REWIND:
@@ -149,7 +159,7 @@ float TransportCommand::get_speed(int command, float speed)
 
 	case FAST_FWD:
 	case FAST_REWIND:
-		return speed ? speed : 2.;
+		return speed ? speed : my_fast_speed;
 	}
 
 	return 0.;