cleanup of hv6 merge, add webm rendering

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

diff --git a/cinelerra-5.1/cinelerra/preferences.h b/cinelerra-5.1/cinelerra/preferences.h
index 889624ab8a3f720c2e6b7bb4bb1bda37c40f9682..d6f1821d57a27f8ecaeb50ea4f595d7e77ea300d 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferences.h
+++ b/cinelerra-5.1/cinelerra/preferences.h
@@ -93,6 +93,7 @@ public:
        double render_preroll;
        int brender_preroll;
        int force_uniprocessor;
+       int project_smp;
 // The number of cpus to use when rendering.
 // Determined by /proc/cpuinfo and force_uniprocessor
        int processors;
@@ -104,6 +105,9 @@ public:
        int ffmpeg_marker_indexes;
 // warning
        int warn_indexes;
+       int warn_version;
+// popup menus activate on button release
+       int popupmenu_btnup;
 // use dvd yuv420p interlace format
        int dvd_yuv420p_interlace;