cwindow_scrollbars = 0;
cwindow_xscroll = cwindow_yscroll = 0;
cwindow_zoom = 1.0;
- strcpy(default_atransition, "");
- strcpy(default_vtransition, "");
+ cwindow_click2play = 0;
+ 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;
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;
+ render_beep = 0;
decode_subtitles = 0;
subtitle_number = 0;
label_cells = 0;
scrub_speed = 2.;
show_assets = 1;
show_titles = 1;
+ si_useduration = 1;
+ si_duration = 3;
test_playback_edits = 1;
time_format = TIME_HMSF;
nudge_format = 1;
view_follows_playback = 1;
vwindow_meter = 0;
vwindow_zoom = 1.;
+ vwindow_click2play = 0;
playback_config = new PlaybackConfig;
}
(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;
*result = brender_start;
}
-
int EDLSession::load_defaults(BC_Hash *defaults)
{
char string[BCTEXTLEN];
+ audio_channels = defaults->get("ACHANNELS", audio_channels);
+ audio_tracks = defaults->get("ATRACKS", audio_tracks);
// Default channel positions
- for(int i = 0; i < MAXCHANNELS; i++)
- {
+ for( int i=0; i<MAXCHANNELS; ++i ) {
sprintf(string, "ACHANNEL_ANGLE_%d", i);
- int default_position = i * 30;
-
- if(i == 0) default_position = 180;
- else
- if(i == 1) default_position = 0;
- else
- if(default_position == 90) default_position = 300;
- else
- if(default_position == 0) default_position = 330;
-
- achannel_positions[i] = defaults->get(string, default_position);
+ achannel_positions[i] = defaults->get(string,
+ default_audio_channel_position(i, audio_channels));
}
aconfig_in->load_defaults(defaults);
assetlist_format = defaults->get("ASSETLIST_FORMAT", ASSETS_ICONS);
sprintf(string, "ASSET_COLUMN%d", i);
asset_columns[i] = defaults->get(string, 100);
}
- audio_channels = defaults->get("ACHANNELS", audio_channels);
- audio_tracks = defaults->get("ATRACKS", audio_tracks);
auto_conf->load_defaults(defaults);
autos_follow_edits = defaults->get("AUTOS_FOLLOW_EDITS", 1);
brender_start = defaults->get("BRENDER_START", brender_start);
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);
cwindow_xscroll = defaults->get("CWINDOW_XSCROLL", 0);
cwindow_yscroll = defaults->get("CWINDOW_YSCROLL", 0);
cwindow_zoom = defaults->get("CWINDOW_ZOOM", (float)1);
- sprintf(default_atransition, _("Crossfade"));
+ cwindow_click2play = defaults->get("CWINDOW_CLICK2PLAY", 0);
+ 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);
view_follows_playback = defaults->get("VIEW_FOLLOWS_PLAYBACK", 1);
vwindow_meter = defaults->get("VWINDOW_METER", 0);
vwindow_zoom = defaults->get("VWINDOW_ZOOM", (float)1);
+ vwindow_click2play = defaults->get("VWINDOW_CLICK2PLAY", 0);
decode_subtitles = defaults->get("DECODE_SUBTITLES", decode_subtitles);
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();
defaults->update("CWINDOW_XSCROLL", cwindow_xscroll);
defaults->update("CWINDOW_YSCROLL", cwindow_yscroll);
defaults->update("CWINDOW_ZOOM", cwindow_zoom);
+ defaults->update("CWINDOW_CLICK2PLAY", cwindow_click2play);
defaults->update("DEFAULT_ATRANSITION", default_atransition);
defaults->update("DEFAULT_VTRANSITION", default_vtransition);
defaults->update("DEFAULT_TRANSITION_LENGTH", default_transition_length);
defaults->update("VIEW_FOLLOWS_PLAYBACK", view_follows_playback);
defaults->update("VWINDOW_METER", vwindow_meter);
defaults->update("VWINDOW_ZOOM", vwindow_zoom);
+ defaults->update("VWINDOW_CLICK2PLAY", vwindow_click2play);
defaults->update("DECODE_SUBTITLES", decode_subtitles);
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;
}
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;
// load channels setting
if(append_mode) return 0;
audio_channels = file->tag.get_property("CHANNELS", (int64_t)audio_channels);
-
-
for(int i = 0; i < audio_channels; i++)
{
sprintf(string, "ACHANNEL_ANGLE_%d", i);
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);
cwindow_xscroll = file->tag.get_property("CWINDOW_XSCROLL", cwindow_xscroll);
cwindow_yscroll = file->tag.get_property("CWINDOW_YSCROLL", cwindow_yscroll);
cwindow_zoom = file->tag.get_property("CWINDOW_ZOOM", cwindow_zoom);
+ cwindow_click2play = file->tag.get_property("CWINDOW_CLICK2PLAY", cwindow_click2play);
editing_mode = file->tag.get_property("EDITING_MODE", editing_mode);
folderlist_format = file->tag.get_property("FOLDERLIST_FORMAT", folderlist_format);
highlighted_track = file->tag.get_property("HIGHLIGHTED_TRACK", 0);
tool_window = file->tag.get_property("TOOL_WINDOW", tool_window);
vwindow_meter = file->tag.get_property("VWINDOW_METER", vwindow_meter);
vwindow_zoom = file->tag.get_property("VWINDOW_ZOOM", vwindow_zoom);
+ vwindow_click2play = file->tag.get_property("VWINDOW_CLICK2PLAY", vwindow_click2play);
decode_subtitles = file->tag.get_property("DECODE_SUBTITLES", decode_subtitles);
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();
}
file->tag.set_property("CWINDOW_XSCROLL", cwindow_xscroll);
file->tag.set_property("CWINDOW_YSCROLL", cwindow_yscroll);
file->tag.set_property("CWINDOW_ZOOM", cwindow_zoom);
+ file->tag.set_property("CWINDOW_CLICK2PLAY", cwindow_click2play);
file->tag.set_property("EDITING_MODE", editing_mode);
file->tag.set_property("FOLDERLIST_FORMAT", folderlist_format);
file->tag.set_property("HIGHLIGHTED_TRACK", highlighted_track);
file->tag.set_property("TOOL_WINDOW", tool_window);
file->tag.set_property("VWINDOW_METER", vwindow_meter);
file->tag.set_property("VWINDOW_ZOOM", vwindow_zoom);
+ file->tag.set_property("VWINDOW_CLICK2PLAY", vwindow_click2play);
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");
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();
cwindow_xscroll = session->cwindow_xscroll;
cwindow_yscroll = session->cwindow_yscroll;
cwindow_zoom = session->cwindow_zoom;
+ cwindow_click2play = session->cwindow_click2play;
strcpy(default_atransition, session->default_atransition);
strcpy(default_vtransition, session->default_vtransition);
default_transition_length = session->default_transition_length;
view_follows_playback = session->view_follows_playback;
vwindow_meter = session->vwindow_meter;
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;
+ render_beep = session->render_beep;
subtitle_number = session->subtitle_number;
decode_subtitles = session->decode_subtitles;
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 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);
}