From: Good Guy <good1.2guy@gmail.com>
Date: Tue, 26 Apr 2016 16:49:10 +0000 (-0600)
Subject: fix popupmenu remove_item vs del_item, mv downsample from aud to vid
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=b2106cd755a98389f1f6d373a71201b68377d74f;p=goodguy%2Fhistory.git

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 2f130ede..1b9eaefb 100644
--- 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 96df8847..cef98f4d 100644
--- 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 fdafc29e..b2eb6e73 100644
--- 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 737c84c8..6fe4fc3b 100644
--- 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 c272b123..a719cc00 100644
--- 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 b07ef216..3f6e1712 100644
--- 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 \