wintv remote control + kernel patch, add codec fileref, amp up OpenEDL, add loadmode...

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

diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C
index 4c5cfdd3e49480eaf26e507c09218ae4a113ca6f..90a5319c5b9a37011ed6179525fc9bc244c2c68e 100644 (file)
--- a/cinelerra-5.1/cinelerra/edlsession.C
+++ b/cinelerra-5.1/cinelerra/edlsession.C
@@ -44,8 +44,9 @@ EDLSession::EDLSession(EDL *edl)
        for(int i = 0; i < MAXCHANNELS; i++)
                achannel_positions[i] = 0;
        assetlist_format = ASSETS_ICONS;
+       int xs100 = xS(100);
        for(int i = 0; i < ASSET_COLUMNS; i++)
-               asset_columns[i] = 100;
+               asset_columns[i] = xs100;
        auto_conf = new AutoConf;
        awindow_folder = AW_MEDIA_FOLDER;
        aspect_w = 4;  aspect_h = 3;
@@ -58,8 +59,8 @@ EDLSession::EDLSession(EDL *edl)
        clipboard_length = 0; // unused
        color_model = BC_RGBA8888;
        interlace_mode = ILACE_MODE_UNDETECTED;
-       crop_x1 = 0; crop_x2 = 320;
-       crop_y1 = 0; crop_y2 = 240;
+       crop_x1 = 0; crop_x2 = xS(320);
+       crop_y1 = 0; crop_y2 = yS(240);
        eyedrop_radius = 0;
        ruler_x1 = ruler_y1 = 0.0;
        ruler_x2 = ruler_y2 = 0.0;
@@ -500,7 +501,7 @@ int EDLSession::save_defaults(BC_Hash *defaults)
 void EDLSession::boundaries()
 {
        Workarounds::clamp(audio_tracks, 0, (int)BC_INFINITY);
-       Workarounds::clamp(audio_channels, 1, MAXCHANNELS - 1);
+       Workarounds::clamp(audio_channels, 0, MAXCHANNELS - 1);
        Workarounds::clamp(sample_rate, 1, 1000000);
        Workarounds::clamp(video_tracks, 0, (int)BC_INFINITY);
        Workarounds::clamp(video_channels, 1, MAXCHANNELS - 1);
@@ -930,7 +931,7 @@ void EDLSession::dump()
                "    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 disabled_scale=%d, use_scaler=%d, auto_scale=%d\n"
-               "    proxy_beep=%d render_beep=%d\n",
+               "    proxy_beep=%f render_beep=%f\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,