X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=a88acce6cc95473fa02a2da27cf60d092e69651a;hp=8b53f7ad594b1cb7a61d0e3f7390307e23570624;hb=05a3780d6edd6a792f0dde46ed69e4b740af5a51;hpb=45dd712aa4b2894f6b2390b4797262831dcdb47a

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 8b53f7ad..a88acce6 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -95,6 +95,13 @@ const char *AWindowGUI::folder_names[] =
 	N_("Proxy"),
 };
 
+const char *AVIconDrawing::avicon_names[] =
+{
+	N_("Full Play"),
+	N_("Mouse Over"),
+	N_("Src Target"),
+	N_("No Play"),
+};
 
 AssetVIcon::AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_t length)
  : VIcon(w, h, framerate), Garbage("AssetVIcon")
@@ -277,7 +284,9 @@ void AssetVIconAudio::start(AssetVIcon *vicon)
 {
 	if( running() ) return;
 	interrupted = 0;
-	audio_pos = 0;
+	double pos = vicon->length > 0 ? (double)vicon->seq_no/vicon->length : 0;
+	int audio_len = vicon->audio_size/sizeof(vicon_audio_t);
+	audio_pos = pos * audio_len;
 	this->vicon = vicon;
 	Thread::start();
 }
@@ -305,9 +314,10 @@ void AssetVIcon::start_audio()
 
 void AssetVIcon::stop_audio()
 {
-	if( playing_audio > 0 )
+	if( playing_audio > 0 ) {
 		picon->gui->vicon_audio->stop(0);
-	playing_audio = 0;
+		playing_audio = 0;
+	}
 }
 
 AssetViewPopup::AssetViewPopup(VIconThread *vt, int draw_mode,
@@ -322,31 +332,34 @@ AssetViewPopup::~AssetViewPopup()
 {
 }
 
+int AssetViewPopup::reposition_window(int x, int y, int w, int h)
+{
+	this->bar_h = (VIEW_POPUP_BAR_H * h) / 200;
+	return ViewPopup::reposition_window(x, y, w, h);
+}
+
 int AssetViewPopup::button_press_event()
 {
 	if( !is_event_win() ) return 0;
 	AssetVIconThread *avt = (AssetVIconThread *)vt;
 	if( !avt->vicon ) return 0;
 
-	switch( draw_mode ) {
-	case ASSET_VIEW_MEDIA_MAP:
-	case ASSET_VIEW_FULL:
-		break;
-	default:
-		return 0;
-	}
-
 	int dir = 1;
 	switch( get_buttonpress() ) {
 	case LEFT_BUTTON:
 		break;
+	case MIDDLE_BUTTON:
+		avt->set_view_popup(0);
+		return 1;
 	case WHEEL_DOWN:
-		dir = -1;
-		// fall thru
+		dir = -1; // fall thru
 	case WHEEL_UP:
-		if( draw_mode != ASSET_VIEW_FULL )
-			return avt->zoom_scale(dir);
-		// fall thru
+		switch( draw_mode ) {
+		case ASSET_VIEW_MEDIA:
+		case ASSET_VIEW_MEDIA_MAP:
+			avt->zoom_scale(dir);
+			return 1;
+		} // fall thru
 	default:
 		return 0;
 	}
@@ -435,7 +448,7 @@ int AssetViewPopup::button_press_event()
 			}
 		}
 		mwindow->gui->lock_window("AssetVIcon::popup_button_press");
-		mwindow->select_point(!ctrl_down() && !shift_down() ? pos : start);
+		mwindow->select_point(start);
 		edl->local_session->set_selectionstart(start);
 		edl->local_session->set_selectionend(!shift_down() ? start : end);
 		mwindow->zoom_sample(edl->local_session->zoom_sample);
@@ -454,26 +467,25 @@ int AssetViewPopup::button_release_event()
 
 int AssetViewPopup::cursor_motion_event()
 {
-	if( !is_event_win() ) return 0;
 	AssetVIconThread *avt = (AssetVIconThread *)vt;
-	if( !avt->vicon ||
-	    ( draw_mode != ASSET_VIEW_FULL &&
-	      draw_mode != ASSET_VIEW_MEDIA_MAP ) ) return 0;
-	if( !get_button_down() || get_buttonpress() != LEFT_BUTTON ||
-	    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;
+	if( vicon && dragging && is_event_win() &&
+	    get_button_down() && get_buttonpress() == LEFT_BUTTON &&
+	    !ctrl_down() && !alt_down() && !shift_down() ) {
+		switch( draw_mode ) {
+		case ASSET_VIEW_MEDIA_MAP:
+		case ASSET_VIEW_FULL:
+			MWindow *mwindow = vicon->picon->mwindow;
+			EDL *edl = mwindow->edl;
+			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;
 }
@@ -553,6 +565,7 @@ void AssetViewPopup::draw_vframe(VFrame *vframe)
 
 int AssetViewPopup::keypress_event()
 {
+	int result = 0;
 	AssetVIconThread *avt = (AssetVIconThread *)vt;
 	switch( avt->draw_mode ) {
 	case ASSET_VIEW_MEDIA_MAP:
@@ -560,15 +573,15 @@ int AssetViewPopup::keypress_event()
 		case 'f':
 		case 'F':
 			avt->draw_mode = ASSET_VIEW_FULL;
-			avt->viewing = 0;
-			return 1;
+			result = 1;
 		}
 		break;
 	case ASSET_VIEW_FULL:
 		avt->draw_mode = ASSET_VIEW_MEDIA_MAP;
-		avt->viewing = 0;
-		return 1;
+		result = 1;
 	}
+	if( result ) // zero change for refresh
+		avt->zoom_scale(0);
 	return ViewPopup::keypress_event();
 }
 
@@ -607,15 +620,18 @@ void AssetVIconThread::drawing_stopped()
 void AssetVIconThread::set_view_popup(AssetVIcon *v, int draw_mode)
 {
 	gui->stop_vicon_drawing();
-	int mode = !v ? ASSET_VIEW_NONE :
-		draw_mode >= 0 ? draw_mode :
-		this->draw_mode;
-	this->vicon = v;
-	this->draw_mode = mode;
+	this->draw_mode = draw_mode;
+	set_view_popup(v);
 	gui->start_vicon_drawing();
 }
 
-ViewPopup *AssetVIconThread::new_view_window()
+void AssetVIconThread::set_view_popup(AssetVIcon *v)
+{
+	if( !v ) draw_mode = ASSET_VIEW_NONE;
+	VIconThread::set_view_popup(v);
+}
+
+ViewPopup *AssetVIconThread::new_view_window(ViewPopup *vpopup)
 {
 	BC_WindowBase *parent = wdw->get_parent();
 	int rx = 0, ry = 0, rw = 0, rh = 0;
@@ -631,11 +647,32 @@ ViewPopup *AssetVIconThread::new_view_window()
 	}
 	else
 		parent->get_fullscreen_geometry(rx, ry, rw, rh);
-	AssetViewPopup *popup = new AssetViewPopup(this, draw_mode, rx, ry, rw, rh);
-	if( draw_mode == ASSET_VIEW_MEDIA_MAP || draw_mode == ASSET_VIEW_FULL )
-		vicon->playing_audio = -1;
-	wdw->set_active_subwindow(popup);
-	return popup;
+	AssetViewPopup *av_popup = (AssetViewPopup *)vpopup;
+	if( av_popup )
+		av_popup->reposition_window(rx, ry, rw, rh);
+	else
+		av_popup = new AssetViewPopup(this, draw_mode, rx, ry, rw, rh);
+	int playing_audio = gui->play_off ? -1 : 0;
+	if( !playing_audio ) {
+		switch( draw_mode ) {
+		case ASSET_VIEW_NONE:
+		case ASSET_VIEW_ICON:
+		case ASSET_VIEW_MEDIA_MAP:
+		case ASSET_VIEW_FULL:
+			playing_audio = -1;
+			break;
+		case ASSET_VIEW_MEDIA:
+			switch( gui->vicon_drawing ) {
+			case AVICON_SRC_TARGET:
+			case AVICON_NO_PLAY:
+				playing_audio = -1;
+				break;
+			}
+		}
+	}
+	vicon->playing_audio = playing_audio;
+	wdw->set_active_subwindow(av_popup);
+	return av_popup;
 }
 
 void AssetVIconThread::close_view_popup()
@@ -1248,7 +1285,8 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow)
 	remove_plugin = 0;
 	vicon_thread = 0;
 	vicon_audio = 0;
-	vicon_drawing = 1;
+	vicon_drawing = AVICON_FULL_PLAY;
+	play_off = 0;
 	displayed_folder = AW_NO_FOLDER;
 	new_folder_thread = 0;
 	modify_folder_thread = 0;
@@ -1446,9 +1484,16 @@ void AWindowGUI::create_objects()
 
 	int fx = mwindow->theme->afolders_x, fy = mwindow->theme->afolders_y;
 	int fw = mwindow->theme->afolders_w, fh = mwindow->theme->afolders_h;
-	VFrame **images = mwindow->theme->get_image_set("playpatch_data");
-	AVIconDrawing::calculate_geometry(this, images, &avicon_w, &avicon_h);
-	add_subwindow(avicon_drawing = new AVIconDrawing(this, fw-avicon_w, fy, images));
+	int n = sizeof(AVIconDrawing::avicon_names)/sizeof(AVIconDrawing::avicon_names[0]);
+	int tw = 0;  const char **av_names = AVIconDrawing::avicon_names;
+	for( int i=0; i<n; ++i ) {
+		int nw = get_text_width(MEDIUMFONT, _(av_names[i]));
+		if( tw < nw )  tw = nw;
+	}
+	int pw = BC_PopupMenu::calculate_w(4, tw, -1) + 16;
+	const char *text = _(AVIconDrawing::avicon_names[vicon_drawing]);
+	add_subwindow(avicon_drawing = new AVIconDrawing(this, fw, fy, pw, text));
+	avicon_drawing->create_objects();
 	add_subwindow(add_tools = new AddTools(mwindow, this, fx, fy, _("Visibility")));
 	add_tools->create_objects();
 	fy += add_tools->get_h();  fh -= add_tools->get_h();
@@ -1546,7 +1591,7 @@ void AWindowGUI::reposition_objects()
 	int fx = mwindow->theme->afolders_x, fy = mwindow->theme->afolders_y;
 	int fw = mwindow->theme->afolders_w, fh = mwindow->theme->afolders_h;
 	add_tools->resize_event(fw-avicon_w, add_tools->get_h());
-	avicon_drawing->reposition_window(fw-avicon_w, fy);
+	avicon_drawing->reposition_window(fw-avicon_drawing->get_w(), fy);
 	fy += add_tools->get_h();  fh -= add_tools->get_h();
 	folder_list->reposition_window(fx, fy, fw, fh);
 }
@@ -1581,9 +1626,20 @@ int AWindowGUI::close_event()
 	return 1;
 }
 
-void AWindowGUI::start_vicon_drawing()
+int AWindowGUI::start_vicon_drawing()
 {
-	if( !vicon_drawing || !vicon_thread->interrupted ) return;
+	if( play_off ) return stop_vicon_drawing();
+	if( !vicon_thread->interrupted ) return 1;
+	switch( vicon_drawing ) {
+	case AVICON_FULL_PLAY:  // all vicons, viewing, target
+		break;
+	case AVICON_MOUSE_OVER: // one vicon, viewing, target
+		if( vicon_thread->solo ) break;
+	// fall thru
+	case AVICON_SRC_TARGET: // no vicons, no view, target
+	case AVICON_NO_PLAY:    // no vicons, no view, no target
+		return 0;
+	}
 	if( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER ||
 	    mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ||
 	    mwindow->edl->session->awindow_folder == AW_CLIP_FOLDER ||
@@ -1599,12 +1655,14 @@ void AWindowGUI::start_vicon_drawing()
 			break;
 		}
 	}
+	return 1;
 }
 
-void AWindowGUI::stop_vicon_drawing()
+int AWindowGUI::stop_vicon_drawing()
 {
-	if( vicon_thread->interrupted ) return;
-	vicon_thread->stop_drawing();
+	if( !vicon_thread->interrupted )
+		vicon_thread->stop_drawing();
+	return 0;
 }
 
 void AWindowGUI::close_view_popup()
@@ -2629,7 +2687,7 @@ int AWindowAssets::button_press_event()
 		case WHEEL_UP: {
 			int x = get_cursor_x(), y = get_cursor_y();
 			if( avt->cursor_inside(x, y) && avt->view_win )
-				return avt->zoom_scale(dir);
+				avt->zoom_scale(dir);
 			return 1; }
 		}
 	}
@@ -2743,30 +2801,41 @@ int AWindowAssets::selection_changed()
 
 		deactivate_selection();
 	}
-	else if( gui->vicon_drawing && get_button_down() &&
-		(item = (AssetPicon*)get_selection(0, 0)) != 0 ) {
-		switch( folder ) {
-		case AW_MEDIA_FOLDER:
-		case AW_PROXY_FOLDER:
-		case AWINDOW_USER_FOLDERS:
-			if( get_buttonpress() == LEFT_BUTTON ||
-			    get_buttonpress() == MIDDLE_BUTTON ) {
-				AssetVIcon *vicon = 0;
-				if( !gui->vicon_thread->vicon )
-					vicon = item->vicon;
-				int draw_mode = vicon && get_buttonpress() == MIDDLE_BUTTON ?
-					ASSET_VIEW_MEDIA_MAP : ASSET_VIEW_MEDIA;
-				gui->vicon_thread->set_view_popup(vicon, draw_mode);
-			}
-			break;
-		case AW_CLIP_FOLDER:
-			if( get_buttonpress() == LEFT_BUTTON ) {
-				AssetVIcon *vicon = 0;
-				if( !gui->vicon_thread->vicon )
-					vicon = item->vicon;
-				gui->vicon_thread->set_view_popup(vicon, ASSET_VIEW_ICON);
+	else if( get_button_down() && !gui->play_off &&
+		 mwindow->edl->session->assetlist_format != ASSETS_TEXT ) {
+		item = (AssetPicon*)get_selection(0, 0);
+		if( item && !get_selection(0, 1) ) {
+			switch( folder ) {
+			case AW_MEDIA_FOLDER:
+			case AW_PROXY_FOLDER:
+			case AWINDOW_USER_FOLDERS:
+				if( get_buttonpress() == LEFT_BUTTON ||
+				    get_buttonpress() == MIDDLE_BUTTON ) {
+					AssetVIcon *vicon = 0;
+					AssetVIconThread *avt = gui->vicon_thread;
+					if( !avt->vicon && gui->vicon_drawing != AVICON_NO_PLAY )
+						vicon = item->vicon;
+					int draw_mode = !vicon ?
+							ASSET_VIEW_NONE :
+						get_buttonpress() == MIDDLE_BUTTON ?
+							ASSET_VIEW_MEDIA_MAP : ASSET_VIEW_MEDIA;
+					avt->set_view_popup(vicon, draw_mode);
+				}
+				break;
+			case AW_CLIP_FOLDER:
+				if( get_buttonpress() == LEFT_BUTTON ) {
+					AssetVIcon *vicon = 0;
+					if( !gui->vicon_thread->vicon )
+						vicon = item->vicon;
+					gui->vicon_thread->set_view_popup(vicon, ASSET_VIEW_ICON);
+				}
+				break;
 			}
-			break;
+		}
+		else {
+			gui->vicon_thread->set_view_popup(0);
+			if( gui->vicon_drawing != AVICON_FULL_PLAY )
+				gui->stop_vicon_drawing();
 		}
 	}
 	return 1;
@@ -2785,6 +2854,7 @@ void AWindowAssets::draw_background()
 
 int AWindowAssets::drag_start_event()
 {
+	gui->vicon_thread->set_view_popup(0);
 	int collect_pluginservers = 0;
 	int collect_assets = 0, proxy = 0;
 
@@ -2937,16 +3007,34 @@ int AWindowAssets::column_resize_event()
 	return 1;
 }
 
-int AWindowAssets::focus_in_event()
+int AWindowAssets::cursor_enter_event()
 {
-	int ret = BC_ListBox::focus_in_event();
-	gui->start_vicon_drawing();
+	int ret = BC_ListBox::cursor_enter_event();
+	switch( gui->vicon_drawing ) {
+	case AVICON_FULL_PLAY:
+		gui->start_vicon_drawing();
+		break;
+	case AVICON_MOUSE_OVER:
+	case AVICON_SRC_TARGET:
+	case AVICON_NO_PLAY:
+	default:
+		break;
+	}
 	return ret;
 }
 
+int AWindowAssets::cursor_leave_event()
+{
+	if( !is_event_win() ) return 0;
+	if( !gui->vicon_thread->viewing )
+		gui->stop_vicon_drawing();
+	return BC_ListBox::cursor_leave_event();
+}
+
 int AWindowAssets::focus_out_event()
 {
 	gui->stop_vicon_drawing();
+	gui->vicon_thread->set_view_popup(0);
 	return BC_ListBox::focus_out_event();
 }
 
@@ -2964,10 +3052,28 @@ void AWindowAssets::update_vicon_area()
 
 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];
-		gui->vicon_thread->set_view_popup(picon->vicon);
+	AssetPicon *picon = no >= 0 && no < gui->displayed_assets[0].size() ?
+		(AssetPicon *)gui->displayed_assets[0][no] : 0;
+	AssetVIcon *vicon = !picon ? 0 : picon->vicon;
+	switch( gui->vicon_drawing ) {
+	case AVICON_FULL_PLAY:
+		gui->vicon_thread->solo = 0;
+		if( vicon && gui->vicon_thread->viewing )
+			gui->vicon_thread->set_view_popup(vicon);
+		break;
+	case AVICON_MOUSE_OVER:
+		if( !vicon ) break;
+		gui->vicon_thread->solo = vicon;
+		gui->start_vicon_drawing();
+	// fall thru
+	case AVICON_SRC_TARGET:
+		if( !vicon ) break;
+		if( gui->vicon_thread->viewing )
+			gui->vicon_thread->set_view_popup(vicon);
+		break;
+	case AVICON_NO_PLAY:
+	default:
+		break;
 	}
 	return 0;
 }
@@ -3131,7 +3237,7 @@ int AWindowView::handle_event()
 }
 
 AddTools::AddTools(MWindow *mwindow, AWindowGUI *gui, int x, int y, const char *title)
- : BC_PopupMenu(x, y, BC_Title::calculate_w(gui, title, MEDIUMFONT)+8, title, -1, 0, 4)
+ : BC_PopupMenu(x, y, title, -1, 0)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -3202,36 +3308,71 @@ int AddPluginItem::handle_event()
 	return 1;
 }
 
-AVIconDrawing::AVIconDrawing(AWindowGUI *agui, int x, int y, VFrame **images)
- : BC_Toggle(x, y, images, agui->vicon_drawing)
+AVIconDrawingItem::AVIconDrawingItem(AVIconDrawing *avicon, const char *text, int id)
+ : BC_MenuItem(text)
 {
-	this->agui = agui;
-	set_tooltip(_("Preview"));
+	this->avicon = avicon;
+	this->id = id;
+}
+
+int AVIconDrawingItem::handle_event()
+{
+	for( int i=0; i<AVICON_PLAY_MODES; ++i ) {
+		AVIconDrawingItem *item = (AVIconDrawingItem *) avicon->get_item(i);
+		item->set_checked(id == i);
+	}
+	AWindowGUI *agui = avicon->agui;
+	agui->play_off = 0;
+	avicon->set_text(get_text());
+	agui->stop_vicon_drawing();
+	agui->vicon_thread->set_view_popup(0);
+	agui->vicon_thread->solo = 0;
+	agui->vicon_drawing = id;
+	agui->start_vicon_drawing();
+	return 1;
+}
+
+int AVIconDrawing::draw_face(int dx, int color)
+{
+	int ret = BC_PopupMenu::draw_face(dx, color);
+	if( agui->play_off ) {
+		int lx = get_margin(), ly = get_h()/2;
+		draw_line(lx,ly, get_w()-2*lx,ly);
+	}
+	return ret;
 }
 
-void AVIconDrawing::calculate_geometry(AWindowGUI *agui, VFrame **images, int *ww, int *hh)
+AVIconDrawing::AVIconDrawing(AWindowGUI *agui, int x, int y, int w, const char *text)
+ : BC_PopupMenu(x-w, y, w, text, -1, 0, 4)
 {
-	int text_line = -1, toggle_x = -1, toggle_y = -1;
-	int text_x = -1, text_y = -1, text_w = -1, text_h = -1;
-	BC_Toggle::calculate_extents(agui, images, 1,
-		&text_line, ww, hh, &toggle_x, &toggle_y,
-		&text_x, &text_y, &text_w, &text_h, "", MEDIUMFONT);
+	this->agui = agui;
 }
 
 AVIconDrawing::~AVIconDrawing()
 {
 }
 
-int AVIconDrawing::handle_event()
+void AVIconDrawing::create_objects()
 {
-	agui->vicon_drawing = get_value();
-	if( agui->vicon_drawing )
-		agui->start_vicon_drawing();
-	else
-		agui->stop_vicon_drawing();
-	return 1;
+	AVIconDrawingItem *item;
+	for( int i=0; i<AVICON_PLAY_MODES; ++i ) {
+		add_item(item = new AVIconDrawingItem(this, avicon_names[i], i));
+		item->set_checked(agui->vicon_drawing == i);
+	}
 }
 
+int AVIconDrawing::button_press_event()
+{
+	if( !is_event_win() ) return 0;
+	if( get_buttonpress() == MIDDLE_BUTTON ) {
+		agui->play_off = !agui->play_off ? 1 : 0;
+		draw_face(0, -1);
+		flash(1);
+		agui->start_vicon_drawing();
+		return 1;
+	}
+	return BC_PopupMenu::button_press_event();
+}
 
 AWindowListFormat::AWindowListFormat(MWindow *mwindow, AWindowGUI *gui)
  : BC_MenuItem("","v",'v')