diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-08 18:00:40 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-08 18:00:40 +0000 |
| commit | 2b349c9c45e8e00f393ce620e75ee1dad0adb2c6 (patch) | |
| tree | 63460b134e4fc198229f5c5a72acde28af925218 /libs | |
| parent | 141e02366698cb25adc3e2248c37eecd472faaed (diff) | |
minor cleanups noted while forward porting transport stuff to 3.0
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6035 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
| -rw-r--r-- | libs/ardour/session_events.cc | 27 |
2 files changed, 4 insertions, 25 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index e46b96b594..9831d57829 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -1733,7 +1733,7 @@ class Session : public PBD::StatefulDestructible list<AudioRange> current_audio_range; bool _play_range; - void set_play_range (list<AudioRange>&, bool leave_rolling); + void set_play_range (std::list<AudioRange>&, bool leave_rolling); void unset_play_range (); /* main outs */ diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc index 10201cd638..036918f940 100644 --- a/libs/ardour/session_events.cc +++ b/libs/ardour/session_events.cc @@ -23,6 +23,7 @@ #include <ardour/timestamps.h> #include <pbd/error.h> +#include <pbd/enumwriter.h> #include <glibmm/thread.h> #include <ardour/ardour.h> @@ -36,28 +37,6 @@ using namespace PBD; MultiAllocSingleReleasePool Session::Event::pool ("event", sizeof (Session::Event), 512); -static const char* event_names[] = { - "SetTransportSpeed", - "SetDiskstreamSpeed", - "Locate", - "LocateRoll", - "LocateRollLocate", - "SetLoop", - "PunchIn", - "PunchOut", - "RangeStop", - "RangeLocate", - "Overwrite", - "SetSlaveSource", - "Audition", - "InputConfigurationChange", - "SetAudioRange", - "SetMusicRange", - "SetPlayRange", - "StopOnce", - "AutoLoop" -}; - void Session::add_event (nframes_t frame, Event::Type type, nframes_t target_frame) { @@ -158,8 +137,8 @@ Session::merge_event (Event* ev) default: for (Events::iterator i = events.begin(); i != events.end(); ++i) { if ((*i)->type == ev->type && (*i)->action_frame == ev->action_frame) { - error << string_compose(_("Session: cannot have two events of type %1 at the same frame (%2)."), - event_names[ev->type], ev->action_frame) << endmsg; + error << string_compose(_("Session: cannot have two events of type %1 at the same frame (%2)."), + enum_2_string (ev->type), ev->action_frame) << endmsg; return; } } |