X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvwindowgui.C;h=bc423328da44ebbc7c42b767fdd12c8837439a13;hp=e94bae855b45d8e0974dff4aa2393058e1ed7af9;hb=d60a59baa6cfe24c0fb153ed9e150a834ba29feb;hpb=d371c5ba45b7c98941a6775603eeb5c50014c438

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C
index e94bae85..bc423328 100644
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -112,6 +112,7 @@ void VWindowGUI::draw_wave()
 	int w = mwindow->edl->session->output_w;
 	int h = mwindow->edl->session->output_h;
 	VFrame *vframe = new VFrame(w, h, BC_RGB888);
+	vframe->clear_frame();
 	int sample_rate = mwindow->edl->get_sample_rate();
 	int channels = mwindow->edl->session->audio_channels;
 	if( channels > 2 ) channels = 2;
@@ -165,70 +166,44 @@ void VWindowGUI::change_source(EDL *edl, const char *title)
 void VWindowGUI::update_sources(const char *title)
 {
 	lock_window("VWindowGUI::update_sources");
-
-//printf("VWindowGUI::update_sources 1\n");
 	sources.remove_all_objects();
-//printf("VWindowGUI::update_sources 2\n");
-
-
 
-	for(int i = 0;
-		i < mwindow->edl->clips.total;
-		i++)
-	{
+	for( int i=0; i<mwindow->edl->clips.size(); ++i ) {
 		char *clip_title = mwindow->edl->clips.values[i]->local_session->clip_title;
 		int exists = 0;
 
-		for(int j = 0; j < sources.total; j++)
-		{
-			if(!strcasecmp(sources.values[j]->get_text(), clip_title))
-			{
+		for( int j=0; !exists && j<sources.size(); ++j ) {
+			if( !strcasecmp(sources.values[j]->get_text(), clip_title) )
 				exists = 1;
-			}
 		}
 
-		if(!exists)
-		{
+		if( !exists )
 			sources.append(new BC_ListBoxItem(clip_title));
-		}
 	}
-//printf("VWindowGUI::update_sources 3\n");
 
 	FileSystem fs;
-	for(Asset *current = mwindow->edl->assets->first;
-		current;
-		current = NEXT)
-	{
+	for( Asset *current=mwindow->edl->assets->first; current; current=NEXT ) {
 		char clip_title[BCTEXTLEN];
 		fs.extract_name(clip_title, current->path);
 		int exists = 0;
 
-		for(int j = 0; j < sources.total; j++)
-		{
-			if(!strcasecmp(sources.values[j]->get_text(), clip_title))
-			{
+		for( int j=0; !exists && j<sources.size(); ++j ) {
+			if( !strcasecmp(sources.values[j]->get_text(), clip_title) )
 				exists = 1;
-			}
 		}
 
-		if(!exists)
-		{
+		if( !exists )
 			sources.append(new BC_ListBoxItem(clip_title));
-		}
 	}
 
-//printf("VWindowGUI::update_sources 4\n");
-
-//	source->update_list(&sources);
-//	source->update(title);
 	unlock_window();
 }
 
 void VWindowGUI::create_objects()
 {
+	lock_window("VWindowGUI::create_objects");
 	in_point = 0;
 	out_point = 0;
-	lock_window("VWindowGUI::create_objects");
 	set_icon(mwindow->theme->get_image("vwindow_icon"));
 
 //printf("VWindowGUI::create_objects 1\n");
@@ -487,26 +462,22 @@ void VWindowGUI::drag_motion()
 
 int VWindowGUI::drag_stop()
 {
-	if(get_hidden()) return 0;
+	if( get_hidden() ) return 0;
 
-	if(highlighted &&
-		mwindow->session->current_operation == DRAG_ASSET)
-	{
+	if( highlighted &&
+	    mwindow->session->current_operation == DRAG_ASSET ) {
 		highlighted = 0;
 		canvas->draw_refresh();
 		unlock_window();
 
-		Indexable *indexable = mwindow->session->drag_assets->size() ?
-			mwindow->session->drag_assets->get(0) :
-			0;
-		EDL *edl = mwindow->session->drag_clips->size() ?
-			mwindow->session->drag_clips->get(0) :
-			0;
-		if(indexable)
+		Indexable *indexable =
+			mwindow->session->drag_assets->size() > 0 ?
+				(Indexable *)mwindow->session->drag_assets->get(0) :
+			mwindow->session->drag_clips->size() > 0 ?
+				(Indexable *)mwindow->session->drag_clips->get(0) : 0;
+		if( indexable )
 			vwindow->change_source(indexable);
-		else
-		if(edl)
-			vwindow->change_source(edl);
+
 		lock_window("VWindowGUI::drag_stop");
 		return 1;
 	}
@@ -593,7 +564,7 @@ VWindowEditing::~VWindowEditing()
 
 void VWindowEditing::copy_selection()
 {
-	vwindow->copy();
+	vwindow->copy(subwindow->shift_down());
 }
 
 void VWindowEditing::splice_selection()
@@ -601,7 +572,7 @@ void VWindowEditing::splice_selection()
 	if(vwindow->get_edl())
 	{
 		mwindow->gui->lock_window("VWindowEditing::splice_selection");
-		mwindow->splice(vwindow->get_edl());
+		mwindow->splice(vwindow->get_edl(), subwindow->shift_down());
 		mwindow->gui->unlock_window();
 	}
 }
@@ -611,7 +582,7 @@ void VWindowEditing::overwrite_selection()
 	if(vwindow->get_edl())
 	{
 		mwindow->gui->lock_window("VWindowEditing::overwrite_selection");
-		mwindow->overwrite(vwindow->get_edl());
+		mwindow->overwrite(vwindow->get_edl(), subwindow->shift_down());
 		mwindow->gui->unlock_window();
 	}
 }
@@ -627,7 +598,7 @@ void VWindowEditing::toggle_label()
 	}
 }
 
-void VWindowEditing::prev_label()
+void VWindowEditing::prev_label(int cut)
 {
 	if(vwindow->get_edl())
 	{
@@ -657,7 +628,7 @@ void VWindowEditing::prev_label()
 	}
 }
 
-void VWindowEditing::next_label()
+void VWindowEditing::next_label(int cut)
 {
 	if(vwindow->get_edl())
 	{
@@ -729,7 +700,7 @@ void VWindowEditing::to_clip()
 {
 	EDL *edl = vwindow->get_edl();
 	if( !edl ) return;
-	mwindow->to_clip(edl, _("viewer window: "));
+	mwindow->to_clip(edl, _("viewer window: "), subwindow->shift_down());
 }
 
 VWindowSource::VWindowSource(MWindow *mwindow, VWindowGUI *vwindow, int x, int y)
@@ -886,6 +857,12 @@ void VWindowCanvas::draw_refresh(int flush)
 	}
 }
 
+int VWindowCanvas::need_overlays()
+{
+	if( gui->highlighted ) return 1;
+	return 0;
+}
+
 void VWindowCanvas::draw_overlays()
 {
 	if( gui->highlighted )