playback_cursor_visible = 0;
playback_preload = 0;
proxy_scale = 1;
+ proxy_disabled_scale = 1;
proxy_use_scaler = 0;
proxy_auto_scale = 1;
proxy_beep = 0;
(subtitle_number != ptr->subtitle_number) ||
(interpolate_raw != ptr->interpolate_raw) ||
(white_balance_raw != ptr->white_balance_raw) ||
+ (proxy_disabled_scale != ptr->proxy_disabled_scale) ||
(proxy_scale != ptr->proxy_scale) ||
(proxy_use_scaler != ptr->proxy_use_scaler));
}
session->white_balance_raw != white_balance_raw ||
session->decode_subtitles != decode_subtitles ||
session->subtitle_number != subtitle_number ||
+ session->proxy_disabled_scale != proxy_disabled_scale ||
session->proxy_scale != proxy_scale ||
session->proxy_use_scaler != proxy_use_scaler )
*result = 0;
ruler_x2 = defaults->get("RULER_X2", 0.0);
ruler_y1 = defaults->get("RULER_Y1", 0.0);
ruler_y2 = defaults->get("RULER_Y2", 0.0);
- awindow_folder = defaults->get("AWINDOW_FOLDER", awindow_folder);
+ awindow_folder = defaults->get("AWINDOW_FOLDER", AW_MEDIA_FOLDER);
cursor_on_frames = defaults->get("CURSOR_ON_FRAMES", 1);
typeless_keyframes = defaults->get("TYPELESS_KEYFRAMES", 0);
cwindow_dest = defaults->get("CWINDOW_DEST", 0);
aspect_w = file->tag.get_property("ASPECTW", aspect_w);
aspect_h = file->tag.get_property("ASPECTH", aspect_h);
proxy_scale = file->tag.get_property("PROXY_SCALE", proxy_scale);
+ proxy_disabled_scale = file->tag.get_property("PROXY_DISABLED_SCALE", proxy_disabled_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);
return 0;
ruler_y1 = file->tag.get_property("RULER_Y1", ruler_y1);
ruler_x2 = file->tag.get_property("RULER_X2", ruler_x2);
ruler_y2 = file->tag.get_property("RULER_Y2", ruler_y2);
- string[0] = 0;
- file->tag.get_property("CURRENT_FOLDER", string);
- if( string[0] ) {
- awindow_folder = AWindowGUI::folder_number(string);
- if( awindow_folder < 0 ) awindow_folder = AW_MEDIA_FOLDER;
- }
- file->tag.get_property("AWINDOW_FOLDER", awindow_folder);
+ awindow_folder = file->tag.get_property("AWINDOW_FOLDER", AW_MEDIA_FOLDER);
cursor_on_frames = file->tag.get_property("CURSOR_ON_FRAMES", cursor_on_frames);
typeless_keyframes = file->tag.get_property("TYPELESS_KEYFRAMES", typeless_keyframes);
cwindow_dest = file->tag.get_property("CWINDOW_DEST", cwindow_dest);
file->tag.set_property("ASPECTW", aspect_w);
file->tag.set_property("ASPECTH", aspect_h);
file->tag.set_property("PROXY_SCALE", proxy_scale);
+ file->tag.set_property("PROXY_DISABLED_SCALE", proxy_disabled_scale);
file->tag.set_property("PROXY_USE_SCALER", proxy_use_scaler);
file->tag.set_property("PROXY_AUTO_SCALE", proxy_auto_scale);
file->append_tag();
vwindow_zoom = session->vwindow_zoom;
vwindow_click2play = session->vwindow_click2play;
proxy_scale = session->proxy_scale;
+ proxy_disabled_scale = session->proxy_disabled_scale;
proxy_use_scaler = session->proxy_use_scaler;
proxy_auto_scale = session->proxy_auto_scale;
proxy_beep = session->proxy_beep;
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_beep=%d render_beep=%d\n",
+ " proxy scale=%d\n disabled_scale=%d, use_scaler=%d, 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_scale, proxy_disabled_scale, proxy_use_scaler, proxy_auto_scale,
proxy_beep, render_beep);
}