remove v4l/lml/buz, add symbolic folders, more xlat update, yuyv fixes, v4l2 upgrades

[goodguy/history.git] / cinelerra-5.1 / cinelerra / preferences.C

diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C
index 24d3654c696b30875124eb918685174cc9dae1ab..5922414cc3bc8fa7a959cb7053173e4d3a49b196 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -80,6 +80,9 @@ Preferences::Preferences()
        ffmpeg_early_probe = 0;
        ffmpeg_marker_indexes = 1;
        warn_indexes = 1;
+       warn_version = 1;
+       popupmenu_btnup = 1;
+       dvd_yuv420p_interlace = 0;
 
 // Default brender asset
        brender_asset = new Asset;
@@ -184,6 +187,9 @@ void Preferences::copy_from(Preferences *that)
        ffmpeg_early_probe = that->ffmpeg_early_probe;
        ffmpeg_marker_indexes = that->ffmpeg_marker_indexes;
        warn_indexes = that->warn_indexes;
+       warn_version = that->warn_version;
+       popupmenu_btnup = that->popupmenu_btnup;
+       dvd_yuv420p_interlace = that->dvd_yuv420p_interlace;
        renderfarm_nodes.remove_all_objects();
        renderfarm_ports.remove_all();
        renderfarm_enabled.remove_all();
@@ -330,6 +336,9 @@ int Preferences::load_defaults(BC_Hash *defaults)
        ffmpeg_early_probe = defaults->get("FFMPEG_EARLY_PROBE", ffmpeg_early_probe);
        ffmpeg_marker_indexes = defaults->get("FFMPEG_MARKER_INDEXES", ffmpeg_marker_indexes);
        warn_indexes = defaults->get("WARN_INDEXES", warn_indexes);
+       warn_version = defaults->get("WARN_VERSION", warn_version);
+       popupmenu_btnup = defaults->get("POPUPMENU_BTNUP", popupmenu_btnup);
+       dvd_yuv420p_interlace = defaults->get("DVD_YUV420P_INTERLACE", dvd_yuv420p_interlace);
        use_brender = defaults->get("USE_BRENDER", use_brender);
        brender_fragment = defaults->get("BRENDER_FRAGMENT", brender_fragment);
        cache_size = defaults->get("CACHE_SIZE", cache_size);
@@ -430,6 +439,9 @@ int Preferences::save_defaults(BC_Hash *defaults)
        defaults->update("FFMPEG_EARLY_PROBE", ffmpeg_early_probe);
        defaults->update("FFMPEG_MARKER_INDEXES", ffmpeg_marker_indexes);
        defaults->update("WARN_INDEXES", warn_indexes);
+       defaults->update("WARN_VERSION", warn_version);
+       defaults->update("POPUPMENU_BTNUP", popupmenu_btnup);
+       defaults->update("DVD_YUV420P_INTERLACE", dvd_yuv420p_interlace);
        brender_asset->save_defaults(defaults,
                "BRENDER_",
                1,
@@ -702,7 +714,8 @@ int Preferences::get_asset_file_path(Asset *asset, char *path)
 {
        strcpy(path, asset->path);
        int result = !access(path, R_OK) ? 0 : -1;
-       if( !result && asset->format == FILE_MPEG ) {
+       if( !result && ( asset->format == FILE_MPEG ||
+               asset->format == FILE_VMPEG || asset->format == FILE_AMPEG ) ) {
                char source_filename[BCTEXTLEN], index_filename[BCTEXTLEN];
                IndexFile::get_index_filename(source_filename,
                        index_directory, index_filename, asset->path, ".toc");