#include <gtkmm2ext/utils.h>
#include <ardour/audio_track.h>
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
#include <ardour/plugin_manager.h>
#include <ardour/location.h>
#include <ardour/audioplaylist.h>
#include <ardour/tempo.h>
#include <ardour/utils.h>
-#include "control_protocol.h"
+#include <control_protocol/control_protocol.h>
#include "ardour_ui.h"
#include "editor.h"
using namespace std;
using namespace sigc;
using namespace ARDOUR;
+using namespace PBD;
using namespace Gtk;
using namespace Glib;
using namespace Gtkmm2ext;
using namespace Editing;
using PBD::internationalize;
+using PBD::atoi;
const double Editor::timebar_height = 15.0;
AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (clicked_trackview);
if (atv) {
- DiskStream* ds;
+ AudioDiskstream* ds;
Playlist* pl;
if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()))) {
AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (clicked_trackview);
if (atv) {
- DiskStream* ds;
+ AudioDiskstream* ds;
Playlist* pl;
AudioPlaylist* apl;
yoff = atoi(geometry->property("y_off")->value());
}
- set_geometry_hints (vpacker, g, Gdk::HINT_BASE_SIZE);
set_default_size (g.base_width, g.base_height);
move (x, y);
}
if ((prop = node.property ("zoom"))) {
- set_frames_per_unit (atof (prop->value()));
+ set_frames_per_unit (PBD::atof (prop->value()));
}
if ((prop = node.property ("snap-to"))) {
for (vector<ustring>::iterator i = uris.begin(); i != uris.end(); ++i) {
if ((*i).substr (0,7) == "file://") {
string p = *i;
- url_decode (p);
+ PBD::url_decode (p);
paths.push_back (p.substr (7));
}
}
AudioPlaylist* pl;
vector<AudioRegion*> results;
AudioRegionView* marv;
- DiskStream* ds;
+ AudioDiskstream* ds;
if ((ds = atv.get_diskstream()) == 0) {
/* bus */
AudioPlaylist* pl;
vector<AudioRegion*> results;
AudioRegionView* marv;
- DiskStream* ds;
+ AudioDiskstream* ds;
if ((ds = tatv->get_diskstream()) == 0) {
/* bus */