Tidy.

[ardour.git] / libs / ardour / ardour / midi_patch_manager.h

diff --git a/libs/ardour/ardour/midi_patch_manager.h b/libs/ardour/ardour/midi_patch_manager.h
index f617d82998b44f0c064d0fc5a6a4a05167ef71a6..10d0f99a7ad83b6d67fb25c86d150fe950d2d26d 100644 (file)
--- a/libs/ardour/ardour/midi_patch_manager.h
+++ b/libs/ardour/ardour/midi_patch_manager.h
@@ -63,18 +63,31 @@ public:
        boost::shared_ptr<MasterDeviceNames> master_device_by_model(std::string model_name) 
                { return _master_devices_by_model[model_name]; }
        
+       boost::shared_ptr<ChannelNameSet> find_channel_name_set(
+                       string model, 
+                       string custom_device_mode, 
+                       uint8_t channel) {
+               boost::shared_ptr<MIDI::Name::MasterDeviceNames> master_device = master_device_by_model(model);
+               
+               if (master_device != 0 && custom_device_mode != "") {
+                       return master_device->
+                                channel_name_set_by_device_mode_and_channel(custom_device_mode, channel);
+               } else {
+                       return boost::shared_ptr<ChannelNameSet>();
+               }               
+       }
+
+       
        boost::shared_ptr<Patch> find_patch(
                        string model, 
                        string custom_device_mode, 
                        uint8_t channel, 
                        PatchPrimaryKey patch_key) {
                
-               boost::shared_ptr<MIDI::Name::MasterDeviceNames> master_device = master_device_by_model(model);
+               boost::shared_ptr<ChannelNameSet> channel_name_set = find_channel_name_set(model, custom_device_mode, channel);
                
-               if (master_device != 0 && custom_device_mode != "") {
-                       return master_device->
-                                channel_name_set_by_device_mode_and_channel(custom_device_mode, channel)->
-                                       find_patch(patch_key);                  
+               if (channel_name_set) {
+                       return  channel_name_set->find_patch(patch_key);                        
                } else {
                        return boost::shared_ptr<Patch>();
                }
@@ -86,12 +99,10 @@ public:
                        uint8_t channel, 
                        PatchPrimaryKey patch_key) {
                
-               boost::shared_ptr<MIDI::Name::MasterDeviceNames> master_device = master_device_by_model(model);
+               boost::shared_ptr<ChannelNameSet> channel_name_set = find_channel_name_set(model, custom_device_mode, channel);
                
-               if (master_device != 0 && custom_device_mode != "") {
-                       return master_device->
-                                channel_name_set_by_device_mode_and_channel(custom_device_mode, channel)->
-                                       previous_patch(patch_key);                      
+               if (channel_name_set) {
+                       return  channel_name_set->previous_patch(patch_key);                    
                } else {
                        return boost::shared_ptr<Patch>();
                }
@@ -103,12 +114,10 @@ public:
                        uint8_t channel, 
                        PatchPrimaryKey patch_key) {
                
-               boost::shared_ptr<MIDI::Name::MasterDeviceNames> master_device = master_device_by_model(model);
+               boost::shared_ptr<ChannelNameSet> channel_name_set = find_channel_name_set(model, custom_device_mode, channel);
                
-               if (master_device != 0 && custom_device_mode != "") {
-                       return master_device->
-                                channel_name_set_by_device_mode_and_channel(custom_device_mode, channel)->
-                                       next_patch(patch_key);                  
+               if (channel_name_set) {
+                       return  channel_name_set->next_patch(patch_key);                        
                } else {
                        return boost::shared_ptr<Patch>();
                }