Implement auto-training controllers in the MIDI input mapping dialog.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 5c69edd4450ac4922b30ac05b52a6413c6fe2084..39b259b45938b4a4dbbf9ffedbf36dcb9c4b5ed3 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -199,16 +199,6 @@ public:
                return theme->map_signal(channel);
        }
 
-       unsigned get_audio_source() const
-       {
-               return audio_source_channel;
-       }
-
-       void set_audio_source(unsigned channel)
-       {
-               audio_source_channel = channel;
-       }
-
        unsigned get_master_clock() const
        {
                return master_clock_channel;
@@ -234,6 +224,7 @@ public:
                theme->set_wb(channel, r, g, b);
        }
 
+       // Note: You can also get this through the global variable global_audio_mixer.
        AudioMixer *get_audio_mixer() { return &audio_mixer; }
        const AudioMixer *get_audio_mixer() const { return &audio_mixer; }
 
@@ -367,7 +358,7 @@ private:
                int last_timecode = -1;  // Unwrapped.
        };
        CaptureCard cards[MAX_VIDEO_CARDS];  // protected by <bmusb_mutex>
-       AudioMixer audio_mixer;
+       AudioMixer audio_mixer;  // Same as global_audio_mixer (see audio_mixer.h).
        void get_one_frame_from_each_card(unsigned master_card_index, CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS], bool has_new_frame[MAX_VIDEO_CARDS], int num_samples[MAX_VIDEO_CARDS]);
 
        InputState input_state;