arch bld deps, opus bld fix, add render beep, shortcut filebox ctrl a/z, batchrender...

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

diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C
index f2c3e6321fc1a6cbd7511ae8d9fe4a33dac8fd02..e0d5f7016b733dd2c705656ce1f3ad7b28d4ab6c 100644 (file)
--- a/cinelerra-5.1/cinelerra/edlsession.C
+++ b/cinelerra-5.1/cinelerra/edlsession.C
@@ -102,6 +102,7 @@ EDLSession::EDLSession(EDL *edl)
        proxy_use_scaler = 0;
        proxy_auto_scale = 1;
        proxy_beep = 0;
+       render_beep = 0;
        decode_subtitles = 0;
        subtitle_number = 0;
        label_cells = 0;
@@ -337,6 +338,8 @@ int EDLSession::load_defaults(BC_Hash *defaults)
        subtitle_number = defaults->get("SUBTITLE_NUMBER", subtitle_number);
        label_cells = defaults->get("LABEL_CELLS", label_cells);
        program_no = defaults->get("PROGRAM_NO", program_no);
+       proxy_beep = defaults->get("PROXY_BEEP", proxy_beep);
+       render_beep = defaults->get("RENDER_BEEP", render_beep);
 
        boundaries();
 
@@ -469,7 +472,8 @@ int EDLSession::save_defaults(BC_Hash *defaults)
        defaults->update("SUBTITLE_NUMBER", subtitle_number);
        defaults->update("LABEL_CELLS", label_cells);
        defaults->update("PROGRAM_NO", program_no);
-
+       defaults->update("PROXY_BEEP", proxy_beep);
+       defaults->update("RENDER_BEEP", render_beep);
        return 0;
 }
 
@@ -551,7 +555,6 @@ int EDLSession::load_video_config(FileXML *file, int append_mode, uint32_t load_
        proxy_scale = file->tag.get_property("PROXY_SCALE", proxy_scale);
        proxy_use_scaler = file->tag.get_property("PROXY_USE_SCALER", proxy_use_scaler);
        proxy_auto_scale = file->tag.get_property("PROXY_AUTO_SCALE", proxy_auto_scale);
-       proxy_beep = file->tag.get_property("PROXY_BEEP", proxy_beep);
        return 0;
 }
 
@@ -642,7 +645,8 @@ int EDLSession::load_xml(FileXML *file,
                subtitle_number = file->tag.get_property("SUBTITLE_NUMBER", subtitle_number);
                label_cells = file->tag.get_property("LABEL_CELLS", label_cells);
                program_no = file->tag.get_property("PROGRAM_NO", program_no);
-
+               proxy_beep = file->tag.get_property("PROXY_BEEP", proxy_beep);
+               render_beep = file->tag.get_property("RENDER_BEEP", render_beep);
                boundaries();
        }
 
@@ -705,6 +709,8 @@ int EDLSession::save_xml(FileXML *file)
 
        file->tag.set_property("DECODE_SUBTITLES", decode_subtitles);
        file->tag.set_property("SUBTITLE_NUMBER", subtitle_number);
+       file->tag.set_property("PROXY_BEEP", proxy_beep);
+       file->tag.set_property("RENDER_BEEP", render_beep);
 
        file->append_tag();
        file->tag.set_title("/SESSION");
@@ -744,7 +750,6 @@ int EDLSession::save_video_config(FileXML *file)
        file->tag.set_property("PROXY_SCALE", proxy_scale);
        file->tag.set_property("PROXY_USE_SCALER", proxy_use_scaler);
        file->tag.set_property("PROXY_AUTO_SCALE", proxy_auto_scale);
-       file->tag.set_property("PROXY_BEEP", proxy_beep);
        file->append_tag();
        file->tag.set_title("/VIDEO");
        file->append_tag();
@@ -888,6 +893,7 @@ int EDLSession::copy(EDLSession *session)
        proxy_use_scaler = session->proxy_use_scaler;
        proxy_auto_scale = session->proxy_auto_scale;
        proxy_beep = session->proxy_beep;
+       render_beep = session->render_beep;
 
        subtitle_number = session->subtitle_number;
        decode_subtitles = session->decode_subtitles;
@@ -903,10 +909,12 @@ void EDLSession::dump()
        printf("    audio_tracks=%d audio_channels=%d sample_rate=%jd\n"
                "    video_tracks=%d frame_rate=%f output_w=%d output_h=%d aspect_w=%f aspect_h=%f\n"
                "    decode subtitles=%d subtitle_number=%d label_cells=%d program_no=%d\n"
-               "    proxy_scale=%d\n proxy_use_scaler=%d, proxy_auto_scale=%d proxy_beep=%d\n",
+               "    proxy_scale=%d\n proxy_use_scaler=%d, proxy_auto_scale=%d\n"
+               " proxy_beep=%d render_beep=%d\n",
                audio_tracks, audio_channels, sample_rate, video_tracks,
                frame_rate, output_w, output_h, aspect_w, aspect_h,
                decode_subtitles, subtitle_number, label_cells, program_no,
-               proxy_scale, proxy_use_scaler, proxy_auto_scale, proxy_beep);
+               proxy_scale, proxy_use_scaler, proxy_auto_scale,
+               proxy_beep, render_beep);
 }