X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fvwindow.C;h=45dacc0b8496f4425b782f2b560ac67b7d189a94;hb=296147f865b3572c7e2ecdb47a5d827956221188;hp=d65fd59775f8a44cdcdb2a7503b709453ff87af8;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/vwindow.C b/cinelerra-5.1/cinelerra/vwindow.C
index d65fd597..45dacc0b 100644
--- a/cinelerra-5.1/cinelerra/vwindow.C
+++ b/cinelerra-5.1/cinelerra/vwindow.C
@@ -284,43 +284,6 @@ void VWindow::change_source(EDL *edl)
 		gui->change_source(edl, _("Viewer"));
 }
 
-void VWindow::change_source(char *folder, int item)
-{
-//printf("VWindow::change_source %d\n", __LINE__);
-	int result = 0;
-	if(!running()) return;
-// Search EDLs
-	if(!strcasecmp(folder, CLIP_FOLDER))
-	{
-		if(item < mwindow->edl->clips.total)
-		{
-			change_source(mwindow->edl->clips.values[item]);
-			result = 1;
-		}
-	}
-	else
-// Search media
-	if(!strcasecmp(folder, MEDIA_FOLDER))
-	{
-		if(item < mwindow->edl->assets->total())
-		{
-			change_source(mwindow->edl->assets->get_item_number(item));
-			result = 1;
-		}
-	}
-	else
-// Search extra clip folders
-	{
-	}
-
-	if(!result)
-	{
-		delete_source(1, 1);
-	}
-}
-
-
-
 
 void VWindow::goto_start()
 {
@@ -371,14 +334,6 @@ void VWindow::update_position(int change_type,
 			1);
 
 		double position = edl->local_session->get_selectionstart(1);
-		Asset *asset = edl->assets->first;
-		if( asset && asset->tcstart ) {
-			double rate = asset->video_data ? asset->frame_rate :
-				asset->audio_data ? asset->sample_rate : 0;
-			if( rate > 0 )
-				position += asset->tcstart / rate;
-		}
-
 		if(lock_window) gui->lock_window("VWindow::update_position");
 		gui->clock->update(position);
 		if(lock_window) gui->unlock_window();
@@ -470,10 +425,8 @@ void VWindow::copy()
 		const char *file_string = file.string();
 		long file_length = strlen(file_string);
 		mwindow->gui->lock_window();
-		mwindow->gui->get_clipboard()->to_clipboard(file_string, file_length,
-			SECONDARY_SELECTION);
-		mwindow->gui->get_clipboard()->to_clipboard(file_string, file_length,
-			BC_PRIMARY_SELECTION);
+		mwindow->gui->to_clipboard(file_string, file_length, BC_PRIMARY_SELECTION);
+		mwindow->gui->to_clipboard(file_string, file_length, SECONDARY_SELECTION);
 		mwindow->gui->unlock_window();
 	}
 }