X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Flocalsession.C;h=5d8249fe780d97e5eec9075b384265391f3f3561;hb=a4de4732339bf38b5b225c533be1bdf60748f04a;hp=56a1f92291d772672108b140392e80f8cb0a2fda;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/localsession.C b/cinelerra-5.1/cinelerra/localsession.C
index 56a1f922..5d8249fe 100644
--- a/cinelerra-5.1/cinelerra/localsession.C
+++ b/cinelerra-5.1/cinelerra/localsession.C
@@ -20,6 +20,7 @@
  */
 
 #include "automation.h"
+#include "awindowgui.h"
 #include "clip.h"
 #include "bchash.h"
 #include "edl.h"
@@ -34,6 +35,7 @@ static const char *xml_autogrouptypes_titlesmax[] =
 	"AUTOGROUPTYPE_AUDIO_FADE_MAX",
 	"AUTOGROUPTYPE_VIDEO_FADE_MAX",
 	"AUTOGROUPTYPE_ZOOM_MAX",
+	"AUTOGROUPTYPE_SPEED_MAX",
 	"AUTOGROUPTYPE_X_MAX",
 	"AUTOGROUPTYPE_Y_MAX",
 	"AUTOGROUPTYPE_INT255_MAX"
@@ -44,6 +46,7 @@ static const char *xml_autogrouptypes_titlesmin[] =
 	"AUTOGROUPTYPE_AUDIO_FADE_MIN",
 	"AUTOGROUPTYPE_VIDEO_FADE_MIN",
 	"AUTOGROUPTYPE_ZOOM_MIN",
+	"AUTOGROUPTYPE_SPEED_MIN",
 	"AUTOGROUPTYPE_X_MIN",
 	"AUTOGROUPTYPE_Y_MIN",
 	"AUTOGROUPTYPE_INT255_MIN"
@@ -56,7 +59,7 @@ LocalSession::LocalSession(EDL *edl)
 
 	selectionstart = selectionend = 0;
 	in_point = out_point = -1;
-	strcpy(folder, CLIP_FOLDER);
+	awindow_folder = AW_CLIP_FOLDER;
 	sprintf(clip_title, _("Program"));
 	strcpy(clip_notes, _("Hello world"));
 	clipboard_length = 0;
@@ -81,8 +84,11 @@ LocalSession::LocalSession(EDL *edl)
 	automation_mins[AUTOGROUPTYPE_VIDEO_FADE] = 0;
 	automation_maxs[AUTOGROUPTYPE_VIDEO_FADE] = 100;
 
-	automation_mins[AUTOGROUPTYPE_ZOOM] = 0.001;
-	automation_maxs[AUTOGROUPTYPE_ZOOM] = 4;
+	automation_mins[AUTOGROUPTYPE_ZOOM] = 0.005;
+	automation_maxs[AUTOGROUPTYPE_ZOOM] = 5.000;
+
+	automation_mins[AUTOGROUPTYPE_SPEED] = 0.005;
+	automation_maxs[AUTOGROUPTYPE_SPEED] = 5.000;
 
 	automation_mins[AUTOGROUPTYPE_X] = -100;
 	automation_maxs[AUTOGROUPTYPE_X] = 100;
@@ -108,7 +114,7 @@ void LocalSession::copy_from(LocalSession *that)
 {
 	strcpy(clip_title, that->clip_title);
 	strcpy(clip_notes, that->clip_notes);
-	strcpy(folder, that->folder);
+	awindow_folder = that->awindow_folder;
 	in_point = that->in_point;
 	loop_playback = that->loop_playback;
 	loop_start = that->loop_start;
@@ -155,7 +161,7 @@ void LocalSession::save_xml(FileXML *file, double start)
 	file->tag.set_property("SELECTION_END", selectionend - start);
 	file->tag.set_property("CLIP_TITLE", clip_title);
 	file->tag.set_property("CLIP_NOTES", clip_notes);
-	file->tag.set_property("FOLDER", folder);
+	file->tag.set_property("AWINDOW_FOLDER", awindow_folder);
 	file->tag.set_property("X_PANE", x_pane);
 	file->tag.set_property("Y_PANE", y_pane);
 
@@ -223,7 +229,12 @@ void LocalSession::load_xml(FileXML *file, unsigned long load_flags)
 // Overwritten by MWindow::load_filenames
 		file->tag.get_property("CLIP_TITLE", clip_title);
 		file->tag.get_property("CLIP_NOTES", clip_notes);
-		file->tag.get_property("FOLDER", folder);
+		const char *folder = file->tag.get_property("FOLDER");
+		if( folder ) {
+			awindow_folder = AWindowGUI::folder_number(folder);
+			if( awindow_folder < 0 ) awindow_folder = AW_MEDIA_FOLDER;
+		}
+		awindow_folder = file->tag.get_property("AWINDOW_FOLDER", awindow_folder);
 		loop_playback = file->tag.get_property("LOOP_PLAYBACK", 0);
 		loop_start = file->tag.get_property("LOOP_START", (double)0);
 		loop_end = file->tag.get_property("LOOP_END", (double)0);