X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Floadfile.C;h=dce124911df4b2bb5b5505ac84350b12940f407d;hp=1b86ae7bcaa78a3faf4749d6eaaab783f00b3077;hb=HEAD;hpb=4c207ab325a8e8e6b79a9a18d4647273b5f59f93

diff --git a/cinelerra-5.1/cinelerra/loadfile.C b/cinelerra-5.1/cinelerra/loadfile.C
index 1b86ae7b..27c26991 100644
--- a/cinelerra-5.1/cinelerra/loadfile.C
+++ b/cinelerra-5.1/cinelerra/loadfile.C
@@ -2,6 +2,7 @@
 /*
  * CINELERRA
  * Copyright (C) 2009 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
@@ -36,6 +37,7 @@
 #include "mainsession.h"
 #include "mwindow.h"
 #include "mwindowgui.h"
+#include "preferences.h"
 #include "theme.h"
 
 
@@ -79,7 +81,7 @@ LoadFileThread::LoadFileThread(MWindow *mwindow, Load *load)
 	this->mwindow = mwindow;
 	this->load = load;
 	this->window = 0;
-	load_mode = LOADMODE_REPLACE;
+	load_mode = LOADMODE_RESOURCESONLY;
 	edl_mode = LOADMODE_EDL_CLIP;
 }
 
@@ -95,7 +97,6 @@ BC_Window* LoadFileThread::new_gui()
 	sprintf(default_path, "~");
 	mwindow->defaults->get("DEFAULT_LOADPATH", default_path);
 	load_mode = mwindow->defaults->get("LOAD_MODE", load_mode);
-	edl_mode = mwindow->defaults->get("LOAD_EDL_MODE", edl_mode);
 
 	mwindow->gui->lock_window("LoadFileThread::new_gui");
 	window = new LoadFileWindow(mwindow, this, default_path);
@@ -118,8 +119,11 @@ void LoadFileThread::load_apply()
 {
 	mwindow->defaults->update("DEFAULT_LOADPATH", window->get_submitted_path());
 	mwindow->defaults->update("LOAD_MODE", load_mode);
-	mwindow->defaults->update("LOAD_EDL_MODE", edl_mode);
-
+	if( edl_mode == LOADMODE_EDL_FILEREF )
+		mwindow->show_warning(
+			&mwindow->preferences->warn_fileref,
+			_("Other projects can change this project\n"
+			  "and this can become a broken link"));
 	ArrayList<char*> path_list;
 	path_list.set_array_delete();
 
@@ -133,26 +137,19 @@ void LoadFileThread::load_apply()
 
 // No file selected
 	if( !path_list.size() ) return;
-
-	if( load_mode == LOADMODE_REPLACE )
-		mwindow->set_filename(path_list[0]);
+	int replaced = load_mode == LOADMODE_REPLACE ||
+            load_mode == LOADMODE_REPLACE_CONCATENATE ? 1 : 0;
 
 	mwindow->interrupt_indexes();
 	mwindow->gui->lock_window("LoadFileThread::run");
-	mwindow->load_filenames(&path_list, load_mode, edl_mode, 0);
+	mwindow->load_filenames(&path_list, load_mode, edl_mode, replaced);
 	mwindow->gui->mainmenu->add_load(path_list.values[0]);
 	mwindow->gui->unlock_window();
 	path_list.remove_all_objects();
 
 	mwindow->save_backup();
-
 	mwindow->restart_brender();
-
-	if( load_mode == LOADMODE_REPLACE ||
-	    load_mode == LOADMODE_REPLACE_CONCATENATE )
-		mwindow->session->changes_made = 0;
-	else
-		mwindow->session->changes_made = 1;
+	mwindow->session->changes_made = !replaced ? 1 : 0;
 }
 
 
@@ -172,6 +169,8 @@ LoadFileWindow::LoadFileWindow(MWindow *mwindow,
 {
 	this->thread = thread;
 	this->mwindow = mwindow;
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Loading Files");
 }
 
 LoadFileWindow::~LoadFileWindow()
@@ -188,6 +187,8 @@ void LoadFileWindow::create_objects()
 
 	int x = get_w() / 2 - LoadMode::calculate_w(this, mwindow->theme) / 2;
 	int y = get_y_margin();
+// always start as clip to match historical behavior
+	thread->edl_mode = LOADMODE_EDL_CLIP;
 	loadmode = new LoadMode(mwindow, this, x, y,
 		&thread->load_mode, &thread->edl_mode, 0, 1);
 	loadmode->create_objects();
@@ -267,7 +268,6 @@ int LoadPrevious::handle_event()
 	path_list.set_array_delete();
 	char *out_path;
 	int load_mode = mwindow->defaults->get("LOAD_MODE", LOADMODE_REPLACE);
-	int edl_mode = mwindow->defaults->get("LOAD_EDL_MODE", LOADMODE_EDL_CLIP);
 
 	path_list.append(out_path = new char[strlen(path) + 1]);
 	strcpy(out_path, path);
@@ -277,7 +277,6 @@ int LoadPrevious::handle_event()
 	path_list.remove_all_objects();
 
 	mwindow->defaults->update("LOAD_MODE", load_mode);
-	mwindow->defaults->update("LOAD_EDL_MODE", edl_mode);
 	mwindow->save_backup();
 	mwindow->session->changes_made = 0;
 	return 1;