X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferences.C;h=a3ebc48f576b14f786b2c402daf697b9ff4a1769;hp=f0afe996bf63c7d03c196c4bec0ab06787816d97;hb=8cad02a7b02e4a8543bc5514892b51aed877a193;hpb=258d9cb69d560f40961acdd20866e12e940c2f93 diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C index f0afe996..a3ebc48f 100644 --- a/cinelerra-5.1/cinelerra/preferences.C +++ b/cinelerra-5.1/cinelerra/preferences.C @@ -86,6 +86,7 @@ Preferences::Preferences() project_smp = processors = calculate_processors(0); real_processors = calculate_processors(1); ffmpeg_marker_indexes = 1; + memset(&use_hw_dev, 0, sizeof(use_hw_dev)); warn_indexes = 1; warn_version = 1; bd_warn_root = 1; @@ -98,6 +99,8 @@ Preferences::Preferences() yuv_color_space = BC_COLORS_BT601; yuv_color_range = BC_COLORS_JPEG; autocolor_assets = 0; + ctrl_toggle = 0; + rectify_audio = 0; // Default brender asset brender_asset = new Asset; @@ -204,6 +207,7 @@ void Preferences::copy_from(Preferences *that) processors = that->processors; real_processors = that->real_processors; ffmpeg_marker_indexes = that->ffmpeg_marker_indexes; + strcpy(use_hw_dev, &that->use_hw_dev[0]); warn_indexes = that->warn_indexes; warn_version = that->warn_version; bd_warn_root = that->bd_warn_root; @@ -216,6 +220,8 @@ void Preferences::copy_from(Preferences *that) yuv_color_space = that->yuv_color_space; yuv_color_range = that->yuv_color_range; autocolor_assets = that->autocolor_assets; + ctrl_toggle = that->ctrl_toggle; + rectify_audio = that->rectify_audio; renderfarm_nodes.remove_all_objects(); renderfarm_ports.remove_all(); renderfarm_enabled.remove_all(); @@ -313,6 +319,7 @@ int Preferences::load_defaults(BC_Hash *defaults) defaults->get("INDEX_DIRECTORY", index_directory); index_size = defaults->get("INDEX_SIZE", index_size); index_count = defaults->get("INDEX_COUNT", index_count); + use_thumbnails = defaults->get("USE_THUMBNAILS", use_thumbnails); keyframe_reticle = defaults->get("KEYFRAME_RETICLE", keyframe_reticle); perpetual_session = defaults->get("PERPETUAL_SESSION", perpetual_session); strcpy(lv2_path, DEFAULT_LV2_PATH); @@ -343,6 +350,8 @@ int Preferences::load_defaults(BC_Hash *defaults) project_smp = defaults->get("PROJECT_SMP", project_smp); force_uniprocessor = defaults->get("FORCE_UNIPROCESSOR", force_uniprocessor); ffmpeg_marker_indexes = defaults->get("FFMPEG_MARKER_INDEXES", ffmpeg_marker_indexes); + memset(&use_hw_dev, 0, sizeof(use_hw_dev)); + defaults->get("USE_HW_DEV", use_hw_dev); warn_indexes = defaults->get("WARN_INDEXES", warn_indexes); warn_version = defaults->get("WARN_VERSION", warn_version); bd_warn_root = defaults->get("BD_WARN_ROOT", bd_warn_root); @@ -355,6 +364,8 @@ int Preferences::load_defaults(BC_Hash *defaults) yuv_color_space = defaults->get("YUV_COLOR_SPACE", yuv_color_space); yuv_color_range = defaults->get("YUV_COLOR_RANGE", yuv_color_range); autocolor_assets = defaults->get("AUTOCOLOR_ASSETS", autocolor_assets); + ctrl_toggle = defaults->get("CTRL_TOGGLE", ctrl_toggle); + rectify_audio = defaults->get("RECTIFY_AUDIO", rectify_audio); use_brender = defaults->get("USE_BRENDER", use_brender); brender_fragment = defaults->get("BRENDER_FRAGMENT", brender_fragment); cache_size = defaults->get("CACHE_SIZE", cache_size); @@ -397,12 +408,10 @@ int Preferences::load_defaults(BC_Hash *defaults) shbtn_prefs.remove_all_objects(); int shbtns_total = defaults->get("SHBTNS_TOTAL", -1); if( shbtns_total < 0 ) { - shbtn_prefs.append(new ShBtnPref(_("Features"), "$CIN_BROWSER file://$CIN_DAT/doc/Features5.pdf", 0)); - shbtn_prefs.append(new ShBtnPref(_("Online Help"), "$CIN_BROWSER https://cinelerra-cv.org/docs.php", 0)); - shbtn_prefs.append(new ShBtnPref(_("Original Manual"), "$CIN_BROWSER file://$CIN_DAT/doc/cinelerra.html", 0)); - shbtn_prefs.append(new ShBtnPref(_("Setting Shell Commands"), "$CIN_BROWSER file://$CIN_DAT/doc/ShellCmds.html", 0)); - shbtn_prefs.append(new ShBtnPref(_("Shortcuts"), "$CIN_BROWSER file://$CIN_DAT/doc/shortcuts.html", 0)); - shbtn_prefs.append(new ShBtnPref(_("RenderMux"), "$CIN_DAT/doc/RenderMux.sh",0)); + shbtn_prefs.append(new ShBtnPref(_("Current Manual"), "$CIN_BROWSER https://cinelerra-gg.org/download/CinelerraGG_manual.pdf")); + shbtn_prefs.append(new ShBtnPref(_("Setting Shell Commands"), "$CIN_BROWSER file://$CIN_DAT/doc/ShellCmds.html")); + shbtn_prefs.append(new ShBtnPref(_("Shortcuts"), "$CIN_BROWSER file://$CIN_DAT/doc/shortcuts.html")); + shbtn_prefs.append(new ShBtnPref(_("RenderMux"), "$CIN_DAT/doc/RenderMux.sh")); shbtns_total = 0; } for( int i=0; iget(string, commands); sprintf(string, "SHBTN%d_WARN", i); int warn = defaults->get(string, 0); - shbtn_prefs.append(new ShBtnPref(name, commands, warn)); + sprintf(string, "SHBTN%d_RUN_SCRIPT", i); + int run_script = defaults->get(string, 0); + shbtn_prefs.append(new ShBtnPref(name, commands, warn, run_script)); } file_probes.remove_all_objects(); @@ -483,6 +494,7 @@ int Preferences::save_defaults(BC_Hash *defaults) defaults->update("PROJECT_SMP", project_smp); defaults->update("FORCE_UNIPROCESSOR", force_uniprocessor); defaults->update("FFMPEG_MARKER_INDEXES", ffmpeg_marker_indexes); + defaults->update("USE_HW_DEV", use_hw_dev); defaults->update("WARN_INDEXES", warn_indexes); defaults->update("WARN_VERSION", warn_version); defaults->update("BD_WARN_ROOT", bd_warn_root); @@ -495,6 +507,8 @@ int Preferences::save_defaults(BC_Hash *defaults) defaults->update("YUV_COLOR_SPACE", yuv_color_space); defaults->update("YUV_COLOR_RANGE", yuv_color_range); defaults->update("AUTOCOLOR_ASSETS", autocolor_assets); + defaults->update("CTRL_TOGGLE", ctrl_toggle); + defaults->update("RECTIFY_AUDIO", rectify_audio); brender_asset->save_defaults(defaults, "BRENDER_", 1, 1, 1, 0, 0); defaults->update("USE_BRENDER", use_brender); defaults->update("BRENDER_FRAGMENT", brender_fragment); @@ -528,6 +542,8 @@ int Preferences::save_defaults(BC_Hash *defaults) defaults->update(string, pref->commands); sprintf(string, "SHBTN%d_WARN", i); defaults->update(string, pref->warn); + sprintf(string, "SHBTN%d_RUN_SCRIPT", i); + defaults->update(string, pref->run_script); } defaults->update("FILE_PROBE_TOTAL", file_probes.size()); for( int i=0; i