Heavy-duty abstraction work to split type-specific classes into

specializations of (new, for the most part) generic bases.  (eg. most everything
from the MIDI branch except for actual MIDI things, so merges have a chance of
succeeding).  Also the new edit toolbar, and various other cleanup things I did
along the way.

Should be functionally equivalent (except the toolbar), this is just design work.

She's a big'un....



git-svn-id: svn://localhost/ardour2/trunk@727 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 22 insertions, 12 deletions

diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc
index 8809c84e7a..f742afd727 100644
--- a/gtk2_ardour/analysis_window.cc
+++ b/gtk2_ardour/analysis_window.cc
@@ -26,7 +26,7 @@
 #include <gtkmm/treeiter.h>
 
 #include <ardour/audioregion.h>
-#include <ardour/playlist.h>
+#include <ardour/audioplaylist.h>
 #include <ardour/types.h>
 
 #include "analysis_window.h"
@@ -35,7 +35,7 @@
 #include "time_axis_view.h"
 #include "public_editor.h"
 #include "selection.h"
-#include "regionview.h"
+#include "audio_region_view.h"
 
 #include "i18n.h"
 
@@ -225,11 +225,16 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
 	
 		Selection s = PublicEditor::instance().get_selection();
 		TimeSelection ts = s.time;
-		AudioRegionSelection ars = s.audio_regions;
+		RegionSelection ars = s.regions;
 	
 	
 		for (TrackSelection::iterator i = s.tracks.begin(); i != s.tracks.end(); ++i) {
-			ARDOUR::Playlist *pl = (*i)->playlist();
+			ARDOUR::AudioPlaylist *pl
+				= dynamic_cast<ARDOUR::AudioPlaylist*>((*i)->playlist());
+
+			if (!pl)
+				continue;
+
 			RouteUI *rui = dynamic_cast<RouteUI *>(*i);
 			
 			// Busses don't have playlists, so we need to check that we actually are working with a playlist
@@ -274,24 +279,29 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
 				
 				TimeAxisView *current_axis = (*i);
 				
-				for (std::set<AudioRegionView *>::iterator j = ars.begin(); j != ars.end(); ++j) {
+				for (std::set<RegionView *>::iterator j = ars.begin(); j != ars.end(); ++j) {
+					// Check that the region is actually audio (so we can analyze it)
+					AudioRegionView* arv = dynamic_cast<AudioRegionView*>(*j);
+					if (!arv)
+						continue;
+					
 					// Check that the region really is selected on _this_ track/solo
-					if ( &(*j)->get_time_axis_view() != current_axis)
+					if ( &arv->get_time_axis_view() != current_axis)
 						continue;
 
-//					cerr << " - " << (*j)->region.name() << ": " << (*j)->region.length() << " samples starting at " << (*j)->region.position() << endl;
+//					cerr << " - " << (*j)->region().name() << ": " << (*j)->region().length() << " samples starting at " << (*j)->region().position() << endl;
 					jack_nframes_t i = 0;
 					int n;
 
-					while ( i < (*j)->region.length() ) {
+					while ( i < arv->region().length() ) {
 						// TODO: What about stereo+ channels? composite all to one, I guess
 
 						n = fft_graph.windowSize();
-						if (i + n >= (*j)->region.length() ) {
-							n = (*j)->region.length() - i;
+						if (i + n >= arv->region().length() ) {
+							n = arv->region().length() - i;
 						}
-				
-						n = (*j)->region.read_at(buf, mixbuf, gain, work, (*j)->region.position() + i, n);
+
+						n = arv->audio_region().read_at(buf, mixbuf, gain, work, arv->region().position() + i, n);
 	
 						if ( n < fft_graph.windowSize()) {
 							for (int j = n; j < fft_graph.windowSize(); j++) {