fix popupmenu remove_item vs del_item, mv downsample from aud to vid

diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C
index 2f130edecf8f4f3f08db2a5dd1de3b5f810c40c1..1b9eaefb25386639a40bc4e7f0d7dd80790c4339 100644 (file)
--- a/cinelerra-5.1/cinelerra/editpopup.C
+++ b/cinelerra-5.1/cinelerra/editpopup.C
@@ -73,10 +73,8 @@ int EditPopup::update(Track *track, Edit *edit)
        else
        if(track->data_type == TRACK_AUDIO && resize_option)
        {
-               remove_item(resize_option);
-               remove_item(matchsize_option);
-               resize_option = 0;
-               matchsize_option = 0;
+               del_item(resize_option);     resize_option = 0;
+               del_item(matchsize_option);  matchsize_option = 0;
        }
        return 0;
 }

diff --git a/cinelerra-5.1/cinelerra/filempeg.C b/cinelerra-5.1/cinelerra/filempeg.C
index 96df8847e11e77cc1c8e1a71a19f264b2366271c..cef98f4dab2df6629b2ff85af1a385ac71efeca7 100644 (file)
--- a/cinelerra-5.1/cinelerra/filempeg.C
+++ b/cinelerra-5.1/cinelerra/filempeg.C
@@ -1875,10 +1875,7 @@ void MPEGABitrate::create_objects()
 
 void MPEGABitrate::set_layer(int layer)
 {
-       while(total_items())
-       {
-               remove_item(0);
-       }
+       while(total_items()) del_item(0);
 
        if(layer == 2)
        {

diff --git a/cinelerra-5.1/cinelerra/pluginfclient.C b/cinelerra-5.1/cinelerra/pluginfclient.C
index fdafc29e72f3860076214daab44f3a415c32ec38..b2eb6e733c8b5403ba7866cef7dcb1ea3feaf835 100644 (file)
--- a/cinelerra-5.1/cinelerra/pluginfclient.C
+++ b/cinelerra-5.1/cinelerra/pluginfclient.C
@@ -272,7 +272,7 @@ void PluginFClientWindow::update(PluginFClient_Opt *opt)
        *(sp=str) = 0;
        if( opt ) opt->ranges(sp);
        range->update(str);
-       while( units->total_items() ) units->remove_item(0);
+       while( units->total_items() ) units->del_item(0);
        ArrayList<const AVOption *> opts;
        int n = !opt ? 0 : opt->units(opts);
        for( int i=0; i<n; ++i )

diff --git a/cinelerra-5.1/cinelerra/shbtnprefs.C b/cinelerra-5.1/cinelerra/shbtnprefs.C
index 737c84c8bb659831bc64cbe878599ec939fbcf9c..6fe4fc3b968dc6922b5bc457ab05a084d1d64236 100644 (file)
--- a/cinelerra-5.1/cinelerra/shbtnprefs.C
+++ b/cinelerra-5.1/cinelerra/shbtnprefs.C
@@ -338,7 +338,7 @@ MainShBtns::MainShBtns(MWindow *mwindow, int x, int y)
 
 int MainShBtns::load(Preferences *preferences)
 {
-       while( total_items() ) remove_item(get_item(0));
+       while( total_items() ) del_item(0);
        for( int i=0; i<preferences->shbtn_prefs.size(); ++i )
                add_item(new MainShBtnItem(this, preferences->shbtn_prefs[i]));
        return 0;

diff --git a/cinelerra-5.1/cinelerra/zoompanel.C b/cinelerra-5.1/cinelerra/zoompanel.C
index c272b123e239b1d31ac5f0c59dcd4543363946f0..a719cc00278d58aa498417a44519d4ce43437f32 100644 (file)
--- a/cinelerra-5.1/cinelerra/zoompanel.C
+++ b/cinelerra-5.1/cinelerra/zoompanel.C
@@ -144,10 +144,7 @@ int ZoomPanel::calculate_w(int menu_w)
 
 void ZoomPanel::update_menu()
 {
-       while(zoom_text->total_items())
-       {
-               zoom_text->remove_item(0);
-       }
+       while(zoom_text->total_items()) zoom_text->del_item(0);
 
        zoom_table.remove_all_objects();
        calculate_menu();

diff --git a/cinelerra-5.1/plugin_defs b/cinelerra-5.1/plugin_defs
index b07ef2160766287366a2f9fceb55685165f0fb8d..3f6e171264eb1862d676156348e817cdbd2cf559 100644 (file)
--- a/cinelerra-5.1/plugin_defs
+++ b/cinelerra-5.1/plugin_defs
@@ -23,15 +23,15 @@ exotic := aging burn dot holo oil edge
 
 plugin_dirs += audio_tools
 audio_tools := audioscope cdripper compressor dcoffset delayaudio \
-       denoisefft denoise despike downsample echocancel echo freeverb \
+       denoisefft denoise despike echocancel echo freeverb \
        gain graphic interpolateaudio invertaudio leveleffect loopaudio \
        normalize overlayaudio parametric pitch removegaps resample \
        resamplert reverb reverseaudio synthesizer timestretch timestretchrt \
        vocoder
 
 plugin_dirs += video_tools
-video_tools := blur decimate delayvideo denoisemjpeg denoisevideo fieldframe \
-       flash framefield freezeframe greycstoration interpolatepixels \
+video_tools := blur decimate delayvideo denoisemjpeg denoisevideo downsample \
+       fieldframe flash framefield freezeframe greycstoration interpolatepixels \
        interpolatevideo invertvideo linearblur loopvideo motion2 motionblur \
        motion overlay radialblur reframe reframert reroute reversevideo \
        seltempavg sharpen spectrogram svg titler timeavg timefront unsharp \