X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedl.C;h=ebab4cd7ed3ea496273f600420b2f9995bf4f22b;hb=a95193c3fd88733d184f2d460eca1fe6ddf8af28;hp=ccc5a1b9999e6ff90692a3847bd897a7c4cf8b18;hpb=559af27994c49da1d98e085f4ac2ec1ad1d1d27c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index ccc5a1b9..ebab4cd7 100644
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -24,7 +24,7 @@
 #include "atrack.h"
 #include "autoconf.h"
 #include "automation.h"
-#include "awindowgui.inc"
+#include "awindowgui.h"
 #include "bccmodels.h"
 #include "bchash.h"
 #include "bcsignals.h"
@@ -70,7 +70,6 @@ EDL::EDL(EDL *parent_edl)
 	tracks = 0;
 	labels = 0;
 	local_session = 0;
-	folders.set_array_delete();
 	id = next_id();
 	path[0] = 0;
 }
@@ -87,7 +86,6 @@ EDL::~EDL()
 		delete assets;
 		delete session;
 	}
-	folders.remove_all_objects();
 }
 
 
@@ -146,9 +144,7 @@ int EDL::create_default_tracks()
 int EDL::load_xml(FileXML *file, uint32_t load_flags)
 {
 	int result = 0;
-
-// Clear objects
-	folders.remove_all_objects();
+	folders.clear();
 
 	if( (load_flags & LOAD_ALL) == LOAD_ALL ) {
 		remove_vwindow_edls();
@@ -237,10 +233,8 @@ int EDL::read_xml(FileXML *file, uint32_t load_flags)
 					result = file->skip_tag();
 			}
 			else
-			if( file->tag.title_is("FOLDER") ) {
-				char folder[BCTEXTLEN];
-				strcpy(folder, file->read_text());
-				new_folder(folder);
+			if( file->tag.title_is("FOLDERS") ) {
+				result = folders.load_xml(file);
 			}
 			else
 			if( file->tag.title_is("MIXERS") ) {
@@ -408,11 +402,8 @@ void EDL::copy_session(EDL *edl, int session_only)
 
 	if( !session_only ) {
 		strcpy(this->path, edl->path);
-//printf("EDL::copy_session %p %s\n", this, this->path);
-
-		folders.remove_all_objects();
-		for( int i=0; i<edl->folders.size(); ++i )
-			folders.append(cstrdup(edl->folders[i]));
+		awindow_folder = edl->awindow_folder;
+		folders.copy_from(&edl->folders);
 	}
 
 	if( !parent_edl ) {
@@ -548,16 +539,7 @@ int EDL::copy(double start, double end, int all,
 		session->save_xml(file);
 		session->save_video_config(file);
 		session->save_audio_config(file);
-
-// Folders
-		for( int i=0; i<folders.size(); ++i ) {
-			file->tag.set_title("FOLDER");
-			file->append_tag();
-			file->append_text(folders[i]);
-			file->tag.set_title("/FOLDER");
-			file->append_tag();
-			file->append_newline();
-		}
+		folders.save_xml(file);
 
 		if( !parent_edl )
 			copy_assets(start, end, file, all, output_path);
@@ -1145,13 +1127,15 @@ void EDL::set_index_file(Indexable *indexable)
 void EDL::optimize()
 {
 //printf("EDL::optimize 1\n");
-	if( local_session->preview_start < 0 ) local_session->preview_start = 0;
 	double length = tracks->total_length();
-	if( local_session->preview_end > length ) local_session->preview_end = length;
-	if( local_session->preview_start >= local_session->preview_end  ) {
-		local_session->preview_start = 0;
-		local_session->preview_end = length;
-	}
+	double preview_start = local_session->preview_start;
+	double preview_end = local_session->preview_end;
+	if( preview_end < 0 || preview_end > length )
+		preview_end = length;
+	if( preview_start == 0 && preview_end >= length )
+		local_session->preview_end = -1;
+	if( preview_start > preview_end )
+		local_session->preview_start = preview_end;
 	for( Track *current=tracks->first; current; current=NEXT )
 		current->optimize();
 }
@@ -1212,18 +1196,58 @@ double EDL::align_to_frame(double position, int round)
 }
 
 
-void EDL::new_folder(const char *folder)
+BinFolder *EDL::get_folder(int no)
 {
-	for( int i=0; i<folders.size(); ++i )
-		if( !strcasecmp(folders[i], folder) ) return;
-	folders.append(cstrdup(folder));
+	for( int i=0; i<folders.size(); ++i ) {
+		BinFolder *fp = folders[i];
+		if( no == fp->awindow_folder ) return fp;
+	}
+	return 0;
 }
 
-void EDL::delete_folder(const char *folder)
+int EDL::get_folder_number(const char *title)
 {
-	int i = folders.size();
-	while( --i >= 0 && strcasecmp(folders[i], folder) );
-	if( i >= 0 ) folders.remove_number(i);
+	for( int i=0; i<AWINDOW_FOLDERS; ++i ) {
+		if( !strcmp(title, AWindowGUI::folder_names[i]) )
+			return i;
+	}
+	for( int i=0; i<folders.size(); ++i ) {
+		if( !strcmp(title, folders[i]->title) )
+			return folders[i]->awindow_folder;
+	}
+        return AW_NO_FOLDER;
+}
+
+const char *EDL::get_folder_name(int no)
+{
+	if( no >= 0 && no<AWINDOW_FOLDERS )
+		return AWindowGUI::folder_names[no];
+	BinFolder *fp = get_folder(no);
+	return !fp ? "" : fp->title;
+}
+
+int EDL::new_folder(const char *title, int is_clips)
+{
+	if( !title[0] ) return 1;
+	int ret = get_folder_number(title);
+	if( ret >= 0 ) return 1;
+	int idx = AWINDOW_FOLDERS;
+	for( int i=0; i<folders.size(); ++i ) {
+		BinFolder *fp = folders[i];
+		int no = fp->awindow_folder;
+		if( no >= idx ) idx = no+1;
+	}
+	folders.append(new BinFolder(idx, is_clips, title));
+	return 0;
+}
+
+int EDL::delete_folder(const char *title)
+{
+	int k = folders.size();
+	while( --k >= 0 && strcmp(title, folders[k]->title) );
+	if( k >= 0 )
+		folders.remove_object_number(k);
+	return k;
 }
 
 int EDL::get_use_vconsole(VEdit* *playable_edit,
@@ -1378,7 +1402,6 @@ int64_t EDL::get_video_frames()
 		session->frame_rate);
 }
 
-
 void EDL::remove_vwindow_edls()
 {
 	for( int i=0; i<total_vwindow_edls(); ++i ) {
@@ -1494,15 +1517,15 @@ void EDL::rescale_proxy(int orig_scale, int new_scale)
 	}
 }
 
-void EDL::set_proxy(int use_scaler, int new_scale, int auto_scale,
+void EDL::set_proxy(int new_scale, int use_scaler,
 	ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets)
 {
-	int orig_use_scaler = session->proxy_use_scaler;
 	int orig_scale = session->proxy_scale;
+	int orig_use_scaler = session->proxy_use_scaler;
+
 // rescale to full size asset in read_frame
-	session->proxy_use_scaler = use_scaler;
 	session->proxy_scale = new_scale;
-	session->proxy_auto_scale = auto_scale;
+	session->proxy_use_scaler = use_scaler;
 
 	if( use_scaler ) {
 		for( int i=0; i<proxy_assets->size(); ++i ) {
@@ -1585,3 +1608,10 @@ void EDL::add_proxy(int use_scaler,
 	}
 }
 
+double EDL::get_cursor_position(int cursor_x, int pane_no)
+{
+	return (double)cursor_x * local_session->zoom_sample / session->sample_rate +
+		(double)local_session->view_start[pane_no] *
+			local_session->zoom_sample / session->sample_rate;
+}
+