Nomenclature cleanups around channels, signals and cards.

[nageru] / nageru / mixer.h

diff --git a/nageru/mixer.h b/nageru/mixer.h
index 49afa7f1f2f7a0e1ce7254e05e0bef3b2b6f8027..61db4a5c30857b06728d8dee0810a6caf3a06df1 100644 (file)
--- a/nageru/mixer.h
+++ b/nageru/mixer.h
@@ -251,14 +251,14 @@ public:
                return theme->get_channel_color(channel);
        }
 
-       int get_channel_signal(unsigned channel) const
+       int map_channel_to_signal(unsigned channel) const
        {
-               return theme->get_channel_signal(channel);
+               return theme->map_channel_to_signal(channel);
        }
 
-       int map_signal(unsigned channel)
+       int map_signal_to_card(int signal)
        {
-               return theme->map_signal(channel);
+               return theme->map_signal_to_card(signal);
        }
 
        unsigned get_master_clock() const