p/s proxy icon, rework window locks, segv in close_mixers + exportedl, ffmpeg default...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / editpopup.C

diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C
index fc1da9d09c7acf518e5cb0ca6e5be287ee6a5c13..e8d27b9609800942374ad2a56ae1f6138a72eebc 100644 (file)
--- a/cinelerra-5.1/cinelerra/editpopup.C
+++ b/cinelerra-5.1/cinelerra/editpopup.C
@@ -25,7 +25,6 @@
 #include "awindowgui.h"
 #include "edit.h"
 #include "editpopup.h"
-#include "cache.h"
 #include "edl.h"
 #include "edlsession.h"
 #include "file.h"
@@ -36,15 +35,10 @@
 #include "mwindow.h"
 #include "mwindowgui.h"
 #include "plugindialog.h"
-#include "preferences.h"
-#include "renderengine.h"
 #include "resizetrackthread.h"
 #include "track.h"
 #include "tracks.h"
 #include "trackcanvas.h"
-#include "transportque.h"
-#include "vframe.h"
-#include "vrender.h"
 
 #include <string.h>
 
@@ -67,13 +61,6 @@ void EditPopup::create_objects()
        add_item(new EditPopupDeleteTrack(mwindow, this));
        add_item(new EditPopupAddTrack(mwindow, this));
 //     add_item(new EditPopupTitle(mwindow, this));
-       EditSnapshot *edit_snapshot;
-       SnapshotSubMenu *snapshot_submenu;
-       add_item(edit_snapshot = new EditSnapshot(mwindow, this));
-       edit_snapshot->add_submenu(snapshot_submenu = new SnapshotSubMenu(edit_snapshot));
-       snapshot_submenu->add_submenuitem(new SnapshotMenuItem(snapshot_submenu, _("png"),  SNAPSHOT_PNG));
-       snapshot_submenu->add_submenuitem(new SnapshotMenuItem(snapshot_submenu, _("jpeg"), SNAPSHOT_JPEG));
-       snapshot_submenu->add_submenuitem(new SnapshotMenuItem(snapshot_submenu, _("tiff"), SNAPSHOT_TIFF));
        resize_option = 0;
        matchsize_option = 0;
 }
@@ -308,6 +295,7 @@ int EditPopupTitleWindow::close_event()
 
 void EditPopupTitleWindow::create_objects()
 {
+       lock_window("EditPopupTitleWindow::create_objects");
        int x = 5;
        int y = 10;
 
@@ -320,6 +308,7 @@ void EditPopupTitleWindow::create_objects()
 
        show_window();
        flush();
+       unlock_window();
 }
 
 
@@ -340,117 +329,3 @@ int EditPopupTitleText::handle_event()
        return 1;
 }
 
-
-
-EditSnapshot::EditSnapshot(MWindow *mwindow, EditPopup *popup)
- : BC_MenuItem(_("Snapshot..."))
-{
-       this->mwindow = mwindow;
-       this->popup = popup;
-}
-
-EditSnapshot::~EditSnapshot()
-{
-}
-
-SnapshotSubMenu::SnapshotSubMenu(EditSnapshot *edit_snapshot)
-{
-       this->edit_snapshot = edit_snapshot;
-}
-
-SnapshotSubMenu::~SnapshotSubMenu()
-{
-}
-
-SnapshotMenuItem::SnapshotMenuItem(SnapshotSubMenu *submenu, const char *text, int mode)
- : BC_MenuItem(text)
-{
-       this->submenu = submenu;
-       this->mode = mode;
-}
-
-SnapshotMenuItem::~SnapshotMenuItem()
-{
-}
-
-int SnapshotMenuItem::handle_event()
-{
-       MWindow *mwindow = submenu->edit_snapshot->mwindow;
-       EDL *edl = mwindow->edl;
-       if( !edl->have_video() ) return 1;
-
-       Preferences *preferences = mwindow->preferences;
-       char filename[BCTEXTLEN];
-       static const char *exts[] = { "png", "jpg", "tif" };
-       time_t tt;     time(&tt);
-       struct tm tm;  localtime_r(&tt,&tm);
-       sprintf(filename,"%s/snap_%04d%02d%02d-%02d%02d%02d.%s",
-               preferences->snapshot_path, 1900+tm.tm_year,tm.tm_mon,tm.tm_mday,
-               tm.tm_hour,tm.tm_min,tm.tm_sec, exts[mode]);
-       int fw = edl->get_w(), fh = edl->get_h();
-       int fcolor_model = edl->session->color_model;
-
-       Asset *asset = new Asset(filename);
-       switch( mode ) {
-       case SNAPSHOT_PNG:
-               asset->format = FILE_PNG;
-               asset->png_use_alpha = 1;
-               break;
-       case SNAPSHOT_JPEG:
-               asset->format = FILE_JPEG;
-               asset->jpeg_quality = 90;
-               break;
-       case SNAPSHOT_TIFF:
-               asset->format = FILE_TIFF;
-               asset->tiff_cmodel = 0;
-               asset->tiff_compression = 0;
-               break;
-       }
-       asset->width = fw;
-       asset->height = fh;
-       asset->audio_data = 0;
-       asset->video_data = 1;
-       asset->video_length = 1;
-       asset->layers = 1;
-
-       File file;
-       int processors = preferences->project_smp + 1;
-       if( processors > 8 ) processors = 8;
-       file.set_processors(processors);
-       int ret = file.open_file(preferences, asset, 0, 1);
-       if( !ret ) {
-               file.start_video_thread(1, fcolor_model,
-                       processors > 1 ? 2 : 1, 0);
-               VFrame ***frames = file.get_video_buffer();
-               VFrame *frame = frames[0][0];
-               TransportCommand command;
-               //command.command = audio_tracks ? NORMAL_FWD : CURRENT_FRAME;
-               command.command = CURRENT_FRAME;
-               command.get_edl()->copy_all(edl);
-               command.change_type = CHANGE_ALL;
-               command.realtime = 0;
-
-               RenderEngine render_engine(0, preferences, 0, 0);
-               CICache video_cache(preferences);
-               render_engine.set_vcache(&video_cache);
-               render_engine.arm_command(&command);
-
-               double position = edl->local_session->get_selectionstart(1);
-               int64_t source_position = (int64_t)(position * edl->get_frame_rate());
-               int ret = render_engine.vrender->process_buffer(frame, source_position, 0);
-               if( !ret )
-                       ret = file.write_video_buffer(1);
-               file.close_file();
-       }
-       if( !ret ) {
-               asset->awindow_folder = AW_MEDIA_FOLDER;
-               mwindow->edl->assets->append(asset);
-               mwindow->awindow->gui->async_update_assets();
-       }
-       else {
-               eprintf("snapshot render failed");
-               asset->remove_user();
-       }
-       return 1;
-}
-