Fix various tooltip markup (ampersand) entity-escape:

[ardour.git] / gtk2_ardour / audio_streamview.cc

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 511b4296ebcaa24ffbed7d33d47c74fd56784e12..95f2c6888be792e21b459ac7175175e24cea8695 100644 (file)
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -49,7 +49,7 @@
 #include "gui_thread.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -111,7 +111,7 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
                break;
        case Destructive:
                region_view = new TapeAudioRegionView (_canvas_group, _trackview, region,
-                                                      _samples_per_pixel, region_color);
+                                                      _samples_per_pixel, region_color);
                break;
        default:
                fatal << string_compose (_("programming error: %1"), "illegal track mode in ::create_region_view()") << endmsg;
@@ -181,7 +181,7 @@ AudioStreamView::setup_rec_box ()
 {
        //cerr << _trackview.name() << " streamview SRB region_views.size() = " << region_views.size() << endl;
 
-       if (_trackview.session()->transport_rolling()) {
+       if (!_trackview.session()->transport_stopped()) {
 
                // cerr << "\trolling\n";
 
@@ -240,8 +240,8 @@ AudioStreamView::setup_rec_box ()
                        create_rec_box(frame_pos, width);
 
                } else if (rec_active &&
-                          (_trackview.session()->record_status() != Session::Recording ||
-                           !_trackview.track()->rec_enable_control()->get_value())) {
+                          (_trackview.session()->record_status() != Session::Recording ||
+                           !_trackview.track()->rec_enable_control()->get_value())) {
                        screen_update_connection.disconnect();
                        rec_active = false;
                        rec_updating = false;