X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fassetpopup.C;h=6b7173099b5b18d8ee08ff38714a1bb0126768e7;hp=244e472fe82f1bcfafb42ec0c64b80bd0dfdc80d;hb=f7444a58936e4ab8fa7e7062281567cbc74e175f;hpb=e41864cf7931bfb86f68c5d35d4578dfe161d386

diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C
index 244e472f..6b717309 100644
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -80,7 +80,8 @@ void AssetPopup::create_objects()
 	add_item(index = new AssetPopupBuildIndex(mwindow, this));
 	add_item(view = new AssetPopupView(mwindow, this));
 	add_item(view_window = new AssetPopupViewWindow(mwindow, this));
-	add_item(mixer = new AssetPopupMixer(mwindow, this));
+	add_item(open_mixer = new AssetPopupOpenMixer(mwindow, this));
+	add_item(insert_mixer = new AssetPopupInsertMixer(mwindow, this));
 	add_item(new AssetPopupPaste(mwindow, this));
 	add_item(menu_item = new BC_MenuItem(_("Match...")));
 	menu_item->add_submenu(submenu = new BC_SubMenu());
@@ -269,25 +270,44 @@ int AssetPopupViewWindow::handle_event()
 	return 1;
 }
 
-AssetPopupMixer::AssetPopupMixer(MWindow *mwindow, AssetPopup *popup)
+AssetPopupOpenMixer::AssetPopupOpenMixer(MWindow *mwindow, AssetPopup *popup)
  : BC_MenuItem(_("Open Mixers"))
 {
 	this->mwindow = mwindow;
 	this->popup = popup;
 }
 
-AssetPopupMixer::~AssetPopupMixer()
+AssetPopupOpenMixer::~AssetPopupOpenMixer()
 {
 }
 
-int AssetPopupMixer::handle_event()
+int AssetPopupOpenMixer::handle_event()
 {
-	mwindow->gui->lock_window("AssetPopupMixer::handle_event");
+	mwindow->gui->lock_window("AssetPopupOpenMixer::handle_event");
 	mwindow->create_mixers();
 	mwindow->gui->unlock_window();
 	return 1;
 }
 
+AssetPopupInsertMixer::AssetPopupInsertMixer(MWindow *mwindow, AssetPopup *popup)
+ : BC_MenuItem(_("Insert Mixers"))
+{
+	this->mwindow = mwindow;
+	this->popup = popup;
+}
+
+AssetPopupInsertMixer::~AssetPopupInsertMixer()
+{
+}
+
+int AssetPopupInsertMixer::handle_event()
+{
+	mwindow->gui->lock_window("AssetPopupInsertMixer::handle_event");
+	mwindow->create_mixers(-1);
+	mwindow->gui->unlock_window();
+	return 1;
+}
+
 AssetPopupPaste::AssetPopupPaste(MWindow *mwindow, AssetPopup *popup)
  : BC_MenuItem(_("Paste"))
 {
@@ -359,9 +379,11 @@ AssetPopupProjectRemove::~AssetPopupProjectRemove()
 
 int AssetPopupProjectRemove::handle_event()
 {
+	popup->gui->unlock_window();
 	mwindow->remove_assets_from_project(1, 1,
 		mwindow->session->drag_assets,
 		mwindow->session->drag_clips);
+	popup->gui->lock_window("AssetPopupProjectRemove::handle_event");
 	return 1;
 }
 
@@ -407,8 +429,10 @@ void AssetListMenu::create_objects()
 	add_item(select_used = new AssetSelectUsed(mwindow, gui));
 	BC_SubMenu *submenu;
 	select_used->add_submenu(submenu = new BC_SubMenu());
+	submenu->add_submenuitem(new AssetSelectUsedItem(select_used, _("All"), SELECT_ALL));
 	submenu->add_submenuitem(new AssetSelectUsedItem(select_used, _("Used"), SELECT_USED));
 	submenu->add_submenuitem(new AssetSelectUsedItem(select_used, _("Unused"), SELECT_UNUSED));
+	submenu->add_submenuitem(new AssetSelectUsedItem(select_used, _("None"), SELECT_NONE));
 	add_item(new AWindowListSort(mwindow, gui));
 	add_item(new AssetListCopy(mwindow, gui));
 	add_item(new AssetListPaste(mwindow, gui));