proxy/mixer fixes, add proxy beep, igor ru xlat

[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 7e07ca8ca4f1be8859725e8013a885c7d44cfc7e..f2c3e6321fc1a6cbd7511ae8d9fe4a33dac8fd02 100644 (file)
--- a/cinelerra-5.1/cinelerra/edlsession.C
+++ b/cinelerra-5.1/cinelerra/edlsession.C
@@ -72,8 +72,8 @@ EDLSession::EDLSession(EDL *edl)
        cwindow_xscroll = cwindow_yscroll = 0;
        cwindow_zoom = 1.0;
        cwindow_click2play = 0;
-       strcpy(default_atransition, "");
-       strcpy(default_vtransition, "");
+       strcpy(default_atransition, INIT_ATRANSITION);
+       strcpy(default_vtransition, INIT_VTRANSITION);
        default_transition_length = 1.0;
        edit_handle_mode[0] = MOVE_ALL_EDITS;
        edit_handle_mode[1] = MOVE_ONE_EDIT;
@@ -101,6 +101,7 @@ EDLSession::EDLSession(EDL *edl)
        proxy_scale = 1;
        proxy_use_scaler = 0;
        proxy_auto_scale = 1;
+       proxy_beep = 0;
        decode_subtitles = 0;
        subtitle_number = 0;
        label_cells = 0;
@@ -248,9 +249,9 @@ int EDLSession::load_defaults(BC_Hash *defaults)
        cwindow_yscroll = defaults->get("CWINDOW_YSCROLL", 0);
        cwindow_zoom = defaults->get("CWINDOW_ZOOM", (float)1);
        cwindow_click2play = defaults->get("CWINDOW_CLICK2PLAY", 0);
-       sprintf(default_atransition, _("Crossfade"));
+       sprintf(default_atransition, INIT_ATRANSITION);
        defaults->get("DEFAULT_ATRANSITION", default_atransition);
-       sprintf(default_vtransition, _("Dissolve"));
+       sprintf(default_vtransition, INIT_VTRANSITION);
        defaults->get("DEFAULT_VTRANSITION", default_vtransition);
        default_transition_length = defaults->get("DEFAULT_TRANSITION_LENGTH", (double)1);
        edit_handle_mode[0] = defaults->get("EDIT_HANDLE_MODE0", MOVE_ALL_EDITS);
@@ -550,6 +551,7 @@ 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;
 }
 
@@ -742,6 +744,7 @@ 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();
@@ -884,6 +887,7 @@ int EDLSession::copy(EDLSession *session)
        proxy_scale = session->proxy_scale;
        proxy_use_scaler = session->proxy_use_scaler;
        proxy_auto_scale = session->proxy_auto_scale;
+       proxy_beep = session->proxy_beep;
 
        subtitle_number = session->subtitle_number;
        decode_subtitles = session->decode_subtitles;
@@ -899,10 +903,10 @@ 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\n",
+               "    proxy_scale=%d\n proxy_use_scaler=%d, proxy_auto_scale=%d proxy_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_scale, proxy_use_scaler, proxy_auto_scale, proxy_beep);
 }