X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=2e02562c19ba4840370471df11ec1859d0a23eda;hp=009647b3dbc7daeb084fd2fc56173be89e4f4ab5;hb=debf38f78ae5ce154f54183b1638278bf8a24736;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 009647b3..2e02562c 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -23,10 +23,11 @@
 #include "asset.h"
 #include "assetedit.h"
 #include "assetpopup.h"
+#include "assetremove.h"
 #include "assets.h"
 #include "audiodevice.h"
-#include "awindowgui.h"
 #include "awindow.h"
+#include "awindowgui.h"
 #include "bccmodels.h"
 #include "bcsignals.h"
 #include "bchash.h"
@@ -39,6 +40,8 @@
 #include "cursors.h"
 #include "cwindowgui.h"
 #include "cwindow.h"
+#include "edits.h"
+#include "edit.h"
 #include "edl.h"
 #include "edlsession.h"
 #include "effectlist.h"
@@ -62,6 +65,7 @@
 #include "samples.h"
 #include "theme.h"
 #include "tracks.h"
+#include "track.h"
 #include "transportque.h"
 #include "vframe.h"
 #include "vicon.h"
@@ -92,7 +96,7 @@ const char *AWindowGUI::folder_names[] =
 
 
 AssetVIcon::AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_t length)
- : VIcon(w, h, framerate)
+ : VIcon(w, h, framerate), Garbage("AssetVIcon")
 {
 	this->picon = picon;
 	this->length = length;
@@ -101,6 +105,7 @@ AssetVIcon::AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_
 
 AssetVIcon::~AssetVIcon()
 {
+	picon->gui->vicon_thread->del_vicon(this);
 	delete temp;
 }
 
@@ -134,11 +139,11 @@ VFrame *AssetVIcon::frame()
 		temp->draw_line(x,0, x,vh);
 		return temp;
 	}
-	int ww = picon->gui->vicon_thread->view_w;
-	int hh = picon->gui->vicon_thread->view_h;
+	int vw = picon->gui->vicon_thread->vw;
+	int vh = picon->gui->vicon_thread->vh;
 	if( !asset->video_data ) {
 		if( !temp ) {
-			temp = new VFrame(0, -1, ww, hh, BC_RGB888, -1);
+			temp = new VFrame(0, -1, vw, vh, BC_RGB888, -1);
 			temp->clear_frame();
 		}
 		return temp;
@@ -161,7 +166,7 @@ VFrame *AssetVIcon::frame()
 			int64_t pos = images.size() / picon->gui->vicon_thread->refresh_rate * frame_rate;
 			file->set_video_position(pos,0);
 			if( file->read_frame(temp) ) temp->clear_frame();
-			add_image(temp, ww, hh, BC_RGB8);
+			add_image(temp, vw, vh, BC_RGB8);
 		}
 		mwindow->video_cache->check_in(asset);
 	}
@@ -289,6 +294,7 @@ void AssetVIconAudio::stop(int wait)
 
 void AssetVIcon::start_audio()
 {
+	if( playing_audio < 0 ) return;
 	picon->gui->vicon_audio->stop(0);
 	playing_audio = 1;
 	picon->gui->vicon_audio->start(this);
@@ -296,10 +302,273 @@ void AssetVIcon::start_audio()
 
 void AssetVIcon::stop_audio()
 {
-	picon->gui->vicon_audio->stop(0);
+	if( playing_audio > 0 )
+		picon->gui->vicon_audio->stop(0);
 	playing_audio = 0;
 }
 
+AssetViewPopup::AssetViewPopup(VIconThread *vt, int draw_mode,
+		VFrame *frame, int x, int y, int w, int h)
+ : ViewPopup(vt, frame, x, y, w, h)
+{
+	this->draw_mode = draw_mode;
+	this->bar_h = (VIEW_POPUP_BAR_H * h) / 200;
+}
+
+AssetViewPopup::~AssetViewPopup()
+{
+}
+
+int AssetViewPopup::button_press_event()
+{
+	if( !is_event_win() ) return 0;
+	AssetVIconThread *avt = (AssetVIconThread *)vt;
+	if( !avt->vicon ) return 0;
+
+	int dir = 1, button = get_buttonpress();
+	switch( button ) {
+	case WHEEL_DOWN: dir = -1; // fall thru
+	case WHEEL_UP:   return zoom_scale(dir);
+	case LEFT_BUTTON:
+		break;
+	default:
+		return 0;
+	}
+
+	if( draw_mode != ASSET_DRAW_MEDIA_MAP ) return 0;
+	int x = get_cursor_x(), y = get_cursor_y();
+	AssetVIcon *vicon = (AssetVIcon *)avt->vicon;
+	AssetPicon *picon = vicon->picon;
+	MWindow *mwindow = picon->mwindow;
+	EDL *edl = mwindow->edl;
+	dragging = 0;
+	if( y < bar_h ) {
+		Indexable *idxbl =
+			picon->indexable ? picon->indexable :
+			picon->edl ? picon->edl : 0;
+		if( !idxbl ) return 0;
+		double sample_rate = idxbl->get_sample_rate();
+		double audio_length = sample_rate > 0 && idxbl->have_audio() ?
+			idxbl->get_audio_samples() / sample_rate : 0;
+		double frame_rate = idxbl->get_frame_rate();
+		double video_length = frame_rate > 0 && idxbl->have_video() ?
+			idxbl->get_video_frames() / frame_rate : 0;
+		double idxbl_length = bmax(audio_length, video_length);
+		double pos = x * idxbl_length / get_w();
+		double start = 0, end = idxbl_length;
+		double lt = DBL_MAX, rt = DBL_MAX;
+		for( Track *track=edl->tracks->first; track!=0; track=track->next ) {
+			for( Edit *edit=track->edits->first; edit!=0; edit=edit->next ) {
+				Indexable *indexable = (Indexable *)edit->asset;
+				if( !indexable ) indexable = (Indexable *)edit->nested_edl;
+				if( !indexable ) continue;
+				if( indexable->id == idxbl->id ||
+				    (!indexable->is_asset == !idxbl->is_asset &&
+				     !strcmp(indexable->path, idxbl->path)) ) {
+					double start_pos = track->from_units(edit->startsource);
+					double end_pos = track->from_units(edit->startsource + edit->length);
+					double dlt = pos - start_pos, drt = end_pos - pos;
+					if( dlt >= 0 &&  dlt < lt ) { lt = dlt;  start = start_pos; }
+					else if( dlt < 0 && -dlt < rt ) { rt = -dlt;  end = start_pos; }
+					if( drt >= 0 &&  drt < rt ) { rt = drt;  end = end_pos; }
+					else if( drt < 0 && -drt < lt ) { lt = -drt; start = end_pos; }
+				}
+			}
+		}
+		mwindow->gui->lock_window("AssetVIcon::popup_button_press");
+		VWindow *vwindow = mwindow->get_viewer(1, 0);
+		vwindow->change_source(idxbl);
+		mwindow->gui->unlock_window();
+		EDL *vedl = vwindow->get_edl();
+		vedl->set_inpoint(start);
+		vedl->set_outpoint(end);
+		vedl->local_session->set_selectionstart(start);
+		vedl->local_session->set_selectionend(end);
+		vwindow->update_position(CHANGE_NONE, 0, 1, 0);
+		return 1;
+	}
+	if( y >= get_h()-bar_h ) {
+		dragging = 1;
+		if( !ctrl_down() )
+			return cursor_motion_event();
+		Indexable *idxbl =
+			picon->indexable ? picon->indexable :
+			picon->edl ? picon->edl : 0;
+		if( !idxbl ) return 0;
+		double total_length = mwindow->edl->tracks->total_length();
+		double pos = x * total_length / get_w();
+		double start = 0, end = total_length;
+		double lt = DBL_MAX, rt = DBL_MAX;
+		for( Track *track=edl->tracks->first; track!=0; track=track->next ) {
+			for( Edit *edit=track->edits->first; edit!=0; edit=edit->next ) {
+				Indexable *indexable = (Indexable *)edit->asset;
+				if( !indexable ) indexable = (Indexable *)edit->nested_edl;
+				if( !indexable ) continue;
+				if( indexable->id == idxbl->id ||
+				    (!indexable->is_asset == !idxbl->is_asset &&
+				     !strcmp(indexable->path, idxbl->path)) ) {
+					double start_pos = track->from_units(edit->startproject);
+					double end_pos = track->from_units(edit->startproject + edit->length);
+					double dlt = pos - start_pos, drt = end_pos - pos;
+					if( dlt >= 0 &&  dlt < lt ) { lt = dlt;  start = start_pos; }
+					else if( dlt < 0 && -dlt < rt ) { rt = -dlt;  end = start_pos; }
+					if( drt >= 0 &&  drt < rt ) { rt = drt;  end = end_pos; }
+					else if( drt < 0 && -drt < lt ) { lt = -drt; start = end_pos; }
+				}
+			}
+		}
+		mwindow->gui->lock_window("AssetVIcon::popup_button_press");
+		edl->local_session->set_selectionstart(pos);
+		edl->local_session->set_selectionend(pos);
+		mwindow->find_cursor();
+		edl->local_session->set_selectionstart(start);
+		edl->local_session->set_selectionend(end);
+		mwindow->zoom_sample(edl->local_session->zoom_sample);
+		mwindow->gui->unlock_window();
+		return 1;
+	}
+	return 0;
+}
+
+int AssetViewPopup::button_release_event()
+{
+	if( !is_event_win() ) return 0;
+	dragging = 0;
+	return 1;
+}
+
+int AssetViewPopup::cursor_motion_event()
+{
+	if( !is_event_win() ) return 0;
+	AssetVIconThread *avt = (AssetVIconThread *)vt;
+	if( !avt->vicon || draw_mode != ASSET_DRAW_MEDIA_MAP ) return 0;
+	if( !get_button_down() || get_buttonpress() != 1 ||
+	    ctrl_down() || alt_down() || shift_down() )
+		return 0;
+	AssetVIcon *vicon = (AssetVIcon *)avt->vicon;
+	MWindow *mwindow = vicon->picon->mwindow;
+	EDL *edl = mwindow->edl;
+	if( dragging ) {
+		int x = get_cursor_x();
+		double total_length = edl->tracks->total_length();
+		double pos = x * total_length / get_w();
+		mwindow->gui->lock_window("AssetVIcon::popup_cursor_motion");
+		mwindow->select_point(pos);
+		mwindow->zoom_sample(edl->local_session->zoom_sample);
+		mwindow->gui->unlock_window();
+		return 1;
+	}
+	return 0;
+}
+
+void AssetViewPopup::draw_vframe(VFrame *vframe) 
+{
+	if( draw_mode == ASSET_DRAW_IMAGE ) {
+		ViewPopup::draw_vframe(vframe);
+		return;
+	}
+	set_color(BLACK);
+	draw_box(0,0,get_w(),get_h());
+	if( draw_mode != ASSET_DRAW_MEDIA_MAP )
+		return;
+	int y1 = bar_h;
+	int y2 = get_h()-bar_h;
+	BC_WindowBase::draw_vframe(vframe, 0,y1, get_w(),y2-y1);
+	AssetVIconThread *avt = (AssetVIconThread *)vt;
+	AssetVIcon *vicon = (AssetVIcon *)avt->vicon;
+	AssetPicon *picon = (AssetPicon *)vicon->picon;
+	Indexable *idxbl =
+		picon->indexable ? picon->indexable :
+		picon->edl ? picon->edl : 0;
+	if( !idxbl ) return;
+	double sample_rate = idxbl->get_sample_rate();
+	double audio_length = sample_rate > 0 && idxbl->have_audio() ?
+		idxbl->get_audio_samples() / sample_rate : 0;
+	double frame_rate = idxbl->get_frame_rate();
+	double video_length = frame_rate > 0 && idxbl->have_video() ?
+		idxbl->get_video_frames() / frame_rate : 0;
+	double idxbl_length = bmax(audio_length, video_length);
+	if( !idxbl_length ) idxbl_length = 1;
+
+	EDL *edl = picon->mwindow->edl;
+	double total_length = edl->tracks->total_length();
+	if( !total_length ) total_length = 1;
+	for( Track *track=edl->tracks->first; track!=0; track=track->next ) {
+		for( Edit *edit=track->edits->first; edit!=0; edit=edit->next ) {
+			Indexable *indexable = (Indexable *)edit->asset;
+			if( !indexable ) indexable = (Indexable *)edit->nested_edl;
+			if( !indexable ) continue;
+			if( indexable->id == idxbl->id ||
+			    (!indexable->is_asset == !idxbl->is_asset &&
+			     !strcmp(indexable->path, idxbl->path)) ) {
+				double pos1 = track->from_units(edit->startsource);
+				double pos2 = track->from_units(edit->startsource + edit->length);
+				double xscale = get_w() / idxbl_length;
+				int ex1 = pos1 * xscale, ex2 = pos2 * xscale;
+				set_color(WHITE);
+				draw_box(ex1,0, ex2-ex1,y1);
+				set_color(BLACK);
+				draw_line(ex1,0, ex1,y1);
+				draw_line(ex2,0, ex2,y1);
+				pos1 = track->from_units(edit->startproject);
+				pos2 = track->from_units(edit->startproject + edit->length);
+				xscale = get_w() / total_length;
+				int px1 = pos1 * xscale, px2 = pos2 * xscale;
+				set_color(RED);
+				draw_box(px1,y2, px2-px1,get_h()-y2);
+				set_color(BLACK);
+				draw_line(px1,y2, px1,get_h()-1);
+				draw_line(px2,y2, px2,get_h()-1);
+
+				set_color(YELLOW);
+				draw_line(ex1,y1, px1,y2);
+				draw_line(ex2,y1, px2,y2);
+			}
+		}
+	}
+}
+
+
+AssetVIconThread::AssetVIconThread(AWindowAssets *asset_list)
+ : VIconThread(asset_list,
+	asset_list->mwindow->preferences->awindow_picon_h * 16/9,
+	asset_list->mwindow->preferences->awindow_picon_h,
+	4 * asset_list->mwindow->preferences->awindow_picon_h * 16/9,
+	4 * asset_list->mwindow->preferences->awindow_picon_h)
+{
+	draw_mode = ASSET_DRAW_IMAGE;
+}
+
+AssetVIconThread::~AssetVIconThread()
+{
+}
+
+void AssetVIconThread::set_view_popup(AssetVIcon *vicon, int draw_mode)
+{
+	if( draw_mode >= 0 )
+		this->draw_mode = draw_mode;
+	VIconThread::set_view_popup(vicon);
+}
+
+ViewPopup *AssetVIconThread::new_view_window(VFrame *frame)
+{
+	BC_WindowBase *parent = wdw->get_parent();
+	XineramaScreenInfo *info = parent->get_xinerama_info(-1);
+	int cx = info ? info->x_org + info->width/2 : parent->get_root_w(0)/2;
+	int cy = info ? info->y_org + info->height/2 : parent->get_root_h(0)/2;
+	int vx = viewing->get_vx(), rx = 0;
+	int vy = viewing->get_vy(), ry = 0;
+	wdw->get_root_coordinates(vx, vy, &rx, &ry);
+	rx += (rx >= cx ? -view_w : viewing->vw);
+	ry += (ry >= cy ? -view_h : viewing->vh);
+	AssetViewPopup *popup = new AssetViewPopup(this, draw_mode,
+		frame, rx, ry, view_w, view_h);
+	if( draw_mode == ASSET_DRAW_MEDIA_MAP )
+		vicon->playing_audio = -1;
+	wdw->set_active_subwindow(popup);
+	return popup;
+}
+
 
 AWindowFolderItem::AWindowFolderItem()
  : BC_ListBoxItem()
@@ -415,8 +684,7 @@ AssetPicon::AssetPicon(MWindow *mwindow,
 
 AssetPicon::~AssetPicon()
 {
-	if( vicon )
-		gui->vicon_thread->del_vicon(vicon);
+	if( vicon ) vicon->remove_user();
 	delete vicon_frame;
 	if( indexable ) indexable->remove_user();
 	if( edl ) edl->remove_user();
@@ -446,14 +714,14 @@ void AssetPicon::draw_hue_bar(VFrame *frame, double duration)
 	}
 }
 
-void AssetPicon::draw_wave(VFrame *frame, double *dp, int len, int base_color, int line_color)
+void AssetPicon::draw_wave(VFrame *frame, double *dp, int len,
+		int base_color, int line_color, int x, int y, int w, int h)
 {
-	int w = frame->get_w(), h = frame->get_h();
-	int h1 = h-1, h2 = h/2, y = h2;
+	int h1 = h-1, h2 = h/2, iy = h2;
 	int rgb_color = frame->pixel_rgb;
-	for( int x=0,x1=0,x2=0; x<w; ++x,x1=x2 ) {
+	for( int ix=0,x1=0,x2=0; ix<w; ++ix,x1=x2 ) {
 		double min = *dp, max = min;
-		x2 = (len * (x+1))/w;
+		x2 = (len * (ix+1))/w;
 		for( int i=x1; i<x2; ++i ) {
 			double value = *dp++;
 			if( value < min ) min = value;
@@ -464,10 +732,10 @@ void AssetPicon::draw_wave(VFrame *frame, double *dp, int len, int base_color, i
 		int y1 = (int)(h2 - min*h2);  CLAMP(y1, 0,h1);
 		int y2 = (int)(h2 - max*h2);  CLAMP(y2, 0,h1);
 		frame->pixel_rgb = line_color;
-		frame->draw_line(x,y1, x,y2);
+		frame->draw_line(ix+x,y1+y, ix+x,y2+y);
 		frame->pixel_rgb = base_color;
-		frame->draw_line(x,y, x,y0);
-		y = y0;
+		frame->draw_line(ix+x,iy+y, ix+x,y0+y);
+		iy = y0;
 	}
 	frame->pixel_rgb = rgb_color;
 }
@@ -525,7 +793,8 @@ void AssetPicon::create_objects()
 	char name[BCTEXTLEN];
 	int pixmap_w, pixmap_h;
 
-	pixmap_h = 50 * BC_WindowBase::get_resources()->icon_scale;
+	int picon_h = mwindow->preferences->awindow_picon_h;
+	pixmap_h = picon_h * BC_WindowBase::get_resources()->icon_scale;
 
 	if( indexable ) {
 		fs.extract_name(name, indexable->path);
@@ -597,6 +866,24 @@ void AssetPicon::create_objects()
 						}
 						gui->vicon_thread->add_vicon(vicon);
 					}
+					else if( asset->folder_no == AW_PROXY_FOLDER ) {
+						char unproxy_path[BCTEXTLEN];
+						int proxy_scale = mwindow->edl->session->proxy_scale;
+						if( !ProxyRender::from_proxy_path(unproxy_path, asset, proxy_scale) ) {
+							Asset *unproxy = mwindow->edl->assets->get_asset(unproxy_path);
+							if( unproxy ) {
+								int i = gui->assets.total;
+								while( --i >= 0 ) {
+									AssetPicon *picon = (AssetPicon*)gui->assets[i];
+									if( picon->id == unproxy->id ) {
+										vicon = picon->vicon;
+										if( vicon ) vicon->add_user();
+										break;
+									}
+								}
+							}
+						}
+					}
 
 				}
 				else {
@@ -1098,7 +1385,7 @@ void AWindowGUI::create_objects()
 	y1 += dy;  h1 -= dy;
 	add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1));
 
-	vicon_thread = new VIconThread(asset_list);
+	vicon_thread = new AssetVIconThread(asset_list);
 	asset_list->update_vicon_area();
 	vicon_thread->start();
 	vicon_audio = new AssetVIconAudio(this);
@@ -1250,6 +1537,7 @@ void AWindowGUI::start_vicon_drawing()
 {
 	if( !vicon_drawing || !vicon_thread->interrupted ) return;
 	if( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER ||
+	    mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ||
 	    mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) {
 		switch( mwindow->edl->session->assetlist_format ) {
 		case ASSETS_ICONS:
@@ -1448,14 +1736,35 @@ int AWindowGUI::keypress_event()
 	case 'v':
 		return cycle_assetlist_format();
 	case DELETE:
-		if( shift_down() ) {
+		if( shift_down() && ctrl_down() ) {
 			PluginServer* plugin = selected_plugin();
 			if( !plugin ) break;
 			remove_plugin = new AWindowRemovePlugin(awindow, plugin);
 			unlock_window();
 			remove_plugin->start();
-			lock_window();
+			lock_window("AWindowGUI::keypress_event 1");
+			return 1;
+		}
+		collect_assets();
+		if( shift_down() ) {
+			mwindow->awindow->asset_remove->start();
+			return 1;
+		}
+		unlock_window();
+		mwindow->remove_assets_from_project(1, 1,
+			mwindow->session->drag_assets,
+			mwindow->session->drag_clips);
+		lock_window("AWindowGUI::keypress_event 2");
+		return 1;
+	case KEY_F1:
+	case KEY_F2:
+	case KEY_F3:
+	case KEY_F4:
+		if( shift_down() && ctrl_down() ) {
+			resend_event(mwindow->gui);
+			return 1;
 		}
+		break;
 	}
 	return 0;
 }
@@ -1836,8 +2145,8 @@ void AWindowGUI::copy_picons(AssetPicon *picon, ArrayList<BC_ListBoxItem*> *src)
 			if( text && text[0] )
 				visible = bstrcasestr(picon->get_text(), text) ? 1 : 0;
 		}
-		if( picon->vicon )
-			picon->vicon->hidden = !visible ? 1 : 0;
+		if( visible && picon->vicon && picon->vicon->hidden )
+			picon->vicon->hidden = 0;
 		if( visible ) {
 			BC_ListBoxItem *item2, *item1;
 			dst[0].append(item1 = picon);
@@ -2127,12 +2436,25 @@ int AWindowFolders::selection_changed()
 
 int AWindowFolders::button_press_event()
 {
-	int result = 0;
+	AssetVIconThread *avt = gui->vicon_thread;
+	if(  gui->asset_list->is_event_win() &&
+	     avt->viewing && avt->view_win ) {
+		int dir = 1, button = get_buttonpress();
+		switch( button ) {
+		case WHEEL_DOWN: dir = -1;  // fall thru
+		case WHEEL_UP: {
+			int x = get_cursor_x(), y = get_cursor_y();
+			if( avt->cursor_inside(x, y) )
+				return avt->view_win->zoom_scale(dir);
+			break; }
+		}
+	}
 
-	result = BC_ListBox::button_press_event();
+	int result = BC_ListBox::button_press_event();
 
 	if( !result ) {
-		if( get_buttonpress() == 3 && is_event_win() && cursor_inside() ) {
+		if( get_buttonpress() == RIGHT_BUTTON &&
+		    is_event_win() && cursor_inside() ) {
 			gui->folderlist_menu->update_titles();
 			gui->folderlist_menu->activate_menu();
 			result = 1;
@@ -2370,15 +2692,19 @@ int AWindowAssets::selection_changed()
 
 		deactivate_selection();
 	}
-	else if( gui->vicon_drawing && get_button_down() && get_buttonpress() == 1 &&
+	else if( gui->vicon_drawing && get_button_down() &&
+		 ( get_buttonpress() == 1 || get_buttonpress() == 2 ) &&
 		 ( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER ||
+		   mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ||
 		   mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) &&
 		   (item = (AssetPicon*)get_selection(0, 0)) != 0 ) {
-		VIcon *vicon = 0;
+		AssetVIcon *vicon = 0;
 		if( !gui->vicon_thread->vicon  ) {
 			vicon = item->vicon;
 		}
-		gui->vicon_thread->set_view_popup(vicon);
+		int draw_mode = vicon && get_buttonpress() == 2 ?
+			ASSET_DRAW_MEDIA_MAP : ASSET_DRAW_IMAGE;
+		gui->vicon_thread->set_view_popup(vicon, draw_mode);
 	}
 	return 1;
 }
@@ -2561,19 +2887,6 @@ int AWindowAssets::focus_out_event()
 	return BC_ListBox::focus_out_event();
 }
 
-int AWindowAssets::cursor_enter_event()
-{
-	int ret = BC_ListBox::cursor_enter_event();
-	gui->start_vicon_drawing();
-	return ret;
-}
-
-int AWindowAssets::cursor_leave_event()
-{
-	gui->stop_vicon_drawing();
-	return BC_ListBox::cursor_leave_event();
-}
-
 void AWindowAssets::update_vicon_area()
 {
 	int x0 = 0, x1 = get_w();
@@ -2591,8 +2904,7 @@ int AWindowAssets::mouse_over_event(int no)
 	if( gui->vicon_thread->viewing &&
 	    no >= 0 && no < gui->displayed_assets[0].size() ) {
 		AssetPicon *picon = (AssetPicon *)gui->displayed_assets[0][no];
-		VIcon *vicon = picon->vicon;
-		picon->gui->vicon_thread->set_view_popup(vicon);
+		gui->vicon_thread->set_view_popup(picon->vicon);
 	}
 	return 0;
 }
@@ -2904,3 +3216,51 @@ int AWindowListSort::handle_event()
 	return 1;
 }
 
+AssetSelectUsedItem::AssetSelectUsedItem(AssetSelectUsed *select_used, const char *text, int action)
+ : BC_MenuItem(text)
+{
+	this->select_used = select_used;
+	this->action = action;
+}
+
+int AssetSelectUsedItem::handle_event()
+{
+	MWindow *mwindow = select_used->mwindow;
+	AWindowGUI *gui = select_used->gui;
+	AWindowAssets *asset_list = gui->asset_list;
+	ArrayList<BC_ListBoxItem*> *data = gui->displayed_assets;
+
+	switch( action ) {
+	case SELECT_ALL:
+	case SELECT_NONE:
+		asset_list->set_all_selected(data, action==SELECT_ALL ? 1 : 0);
+		break;
+	case SELECT_USED:
+	case SELECT_UNUSED:
+		asset_list->set_all_selected(data, 0);
+		for( int i = 0; i < data->total; i++ ) {
+			AssetPicon *picon = (AssetPicon*)data->values[i];
+			Indexable *idxbl = picon->indexable ? picon->indexable :
+			    picon->edl ? picon->edl->get_proxy_asset() : 0;
+			int used = idxbl && mwindow->edl->in_use(idxbl) ? 1 : 0;
+			asset_list->set_selected(data, i, action==SELECT_USED ? used : !used);
+		}
+		break;
+	}
+
+	int asset_xposition = asset_list->get_xposition();
+	int asset_yposition = asset_list->get_yposition();
+	asset_list->update(gui->displayed_assets, gui->asset_titles,
+		mwindow->edl->session->asset_columns, ASSET_COLUMNS,
+		asset_xposition, asset_yposition, -1, 0);
+	asset_list->center_selection();
+	return 1;
+}
+
+AssetSelectUsed::AssetSelectUsed(MWindow *mwindow, AWindowGUI *gui)
+ : BC_MenuItem(_("Select"))
+{
+	this->mwindow = mwindow;
+	this->gui = gui;
+}
+