title color fader/tweaks, bg_color bcbitmap fix, inst.sh fix, lang fr pref tweaks

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / trackpopup.C

diff --git a/cinelerra-5.1/cinelerra/trackpopup.C b/cinelerra-5.1/cinelerra/trackpopup.C
index 0b120882fd3a250f3a376dfeda90429e6b99a549..e1b55dbdbb15fb80dcd46d0cb92d435f10ff7479 100644 (file)
--- a/cinelerra-5.1/cinelerra/trackpopup.C
+++ b/cinelerra-5.1/cinelerra/trackpopup.C
@@ -47,6 +47,11 @@ TrackPopup::TrackPopup(MWindow *mwindow, MWindowGUI *gui)
 {
        this->mwindow = mwindow;
        this->gui = gui;
+       track = 0;
+       edit = 0;
+       pluginset = 0;
+       plugin = 0;
+       position = 0;
 }
 
 TrackPopup::~TrackPopup()
@@ -64,22 +69,25 @@ void TrackPopup::create_objects()
        matchsize_option = 0;
 }
 
-int TrackPopup::update(Track *track)
+int TrackPopup::activate_menu(Track *track, Edit *edit,
+               PluginSet *pluginset, Plugin *plugin, double position)
 {
        this->track = track;
+       this->edit = edit;
+       this->pluginset = pluginset;
+       this->plugin = plugin;
+       this->position = position;
 
-       if(track->data_type == TRACK_VIDEO && !resize_option)
-       {
+       if( track->data_type == TRACK_VIDEO && !resize_option ) {
                add_item(resize_option = new TrackPopupResize(mwindow, this));
                add_item(matchsize_option = new TrackPopupMatchSize(mwindow, this));
        }
-       else
-       if(track->data_type == TRACK_AUDIO && resize_option)
-       {
+       else if( track->data_type == TRACK_AUDIO && resize_option ) {
                del_item(resize_option);     resize_option = 0;
                del_item(matchsize_option);  matchsize_option = 0;
        }
-       return 0;
+
+       return BC_PopupMenu::activate_menu();
 }