Merged with trunk revision 600

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 2e4c3a6ae791d6dbe7067e2ef75f0707703113a5..cc66d1128aa14a7c678da92ed4df6fabcfe1f8bf 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -37,7 +37,7 @@
 #include <ardour/audioengine.h>
 #include <ardour/route.h>
 #include <ardour/audio_track.h>
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
 #include <ardour/panner.h>
 #include <ardour/send.h>
 #include <ardour/insert.h>
@@ -414,14 +414,14 @@ MixerStrip::set_width (Width w)
                set_size_request (-1, -1);
                xml_node->add_property ("strip_width", "wide");
 
-               rec_enable_button->set_label (_("Record"));
-               mute_button->set_label  (_("Mute"));
-               solo_button->set_label (_("Solo"));
+               rec_enable_button->set_label (_("record"));
+               mute_button->set_label  (_("mute"));
+               solo_button->set_label (_("solo"));
 
                if (_route.comment() == "") {
-                      comment_button.set_label (_("Comments"));
+                      comment_button.set_label (_("comments"));
                } else {
-                      comment_button.set_label (_("*Comments*"));
+                      comment_button.set_label (_("*comments*"));
                }
 
                gpm.gain_automation_style_button.set_label (gpm.astyle_string(_route.gain_automation_curve().automation_style()));
@@ -665,9 +665,9 @@ MixerStrip::select_stream_input ()
        MenuList& items = stream_menu->items();
        stream_menu->set_name ("ArdourContextMenu");
        
-       Session::DiskStreamList streams = _session.disk_streams();
+       Session::AudioDiskstreamList streams = _session.audio_disk_streams();
 
-       for (Session::DiskStreamList::iterator i = streams.begin(); i != streams.end(); ++i) {
+       for (Session::AudioDiskstreamList::iterator i = streams.begin(); i != streams.end(); ++i) {
 
                if (!(*i)->hidden()) {
 
@@ -685,7 +685,7 @@ MixerStrip::select_stream_input ()
 }
 
 void
-MixerStrip::stream_input_chosen (DiskStream *stream)
+MixerStrip::stream_input_chosen (AudioDiskstream *stream)
 {
        if (is_audio_track()) {
                audio_track()->set_diskstream (*stream, this);