X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fscopewindow.h;h=385ecaf239ce21a77827b112e7fa126079cbf95b;hp=1f73fc363b2b24b91b944b7b8f7a7f1dcd1de802;hb=1db0dacec8f9d7f5687e582bd282d9bf83bd58f0;hpb=205a66f9f2abd6eac72076f773ce5d75921fa151 diff --git a/cinelerra-5.1/cinelerra/scopewindow.h b/cinelerra-5.1/cinelerra/scopewindow.h index 1f73fc36..385ecaf2 100644 --- a/cinelerra-5.1/cinelerra/scopewindow.h +++ b/cinelerra-5.1/cinelerra/scopewindow.h @@ -36,6 +36,7 @@ enum { SCOPE_HISTOGRAM, SCOPE_HISTOGRAM_RGB, SCOPE_WAVEFORM, SCOPE_WAVEFORM_RGB, SCOPE_WAVEFORM_PLY, SCOPE_VECTORSCOPE, SCOPE_VECTORWHEEL, + SCOPE_SMOOTH, SCOPE_REFRESH, SCOPE_RELEASE, }; // Number of divisions in histogram. @@ -167,6 +168,15 @@ public: ScopeScopesOn *vect_wheel; }; +class ScopeSettingOn : public BC_MenuItem +{ +public: + ScopeSettingOn(ScopeSettings *settings, const char *text, int id); + int handle_event(); + + ScopeSettings *settings; + int id; +}; class ScopeGratPaths : public ArrayList { @@ -178,20 +188,24 @@ public: class ScopeGratItem : public BC_MenuItem { public: - ScopeGratItem(ScopeVectGrats *vect_grats, const char *text, int idx); + ScopeGratItem(ScopeSettings *settings, const char *text, int idx); int handle_event(); - ScopeVectGrats *vect_grats; + ScopeSettings *settings; int idx; }; -class ScopeVectGrats : public BC_PopupMenu +class ScopeSettings : public BC_PopupMenu { public: - ScopeVectGrats(ScopeGUI *gui, int x, int y); + ScopeSettings(ScopeGUI *gui, int x, int y); void create_objects(); + void update_toggles(); ScopeGUI *gui; + ScopeSettingOn *smooth_on; + ScopeSettingOn *refresh_on; + ScopeSettingOn *release_on; }; @@ -249,23 +263,6 @@ public: }; -class ScopeSmooth : public BC_CheckBox -{ -public: - ScopeSmooth(ScopeGUI *gui, int x, int y); - int handle_event(); - ScopeGUI *gui; -}; - -class ScopeRefresh : public BC_CheckBox -{ -public: - ScopeRefresh(ScopeGUI *gui, int x, int y); - int handle_event(); - ScopeGUI *gui; -}; - - class ScopeGUI : public PluginClientWindow { public: @@ -309,9 +306,7 @@ public: ScopeMenu *scope_menu; ScopeWaveSlider *wave_slider; ScopeVectSlider *vect_slider; - ScopeVectGrats *vect_grats; - ScopeSmooth *smooth; - ScopeRefresh *refresh; + ScopeSettings *settings; VFrame *grat_image; OverlayFrame *overlay; @@ -330,7 +325,8 @@ public: int use_hist_parade, use_wave_parade; int bins[HIST_SECTIONS][TOTAL_BINS]; - int frame_w, use_smooth, use_refresh; + int frame_w, use_smooth; + int use_refresh, use_release; int use_wave_gain, use_vect_gain; };