continue with MTC debugging

[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 10d0f99a7ad83b6d67fb25c86d150fe950d2d26d..a48c9ddfe7d0601c884eb4e91835254c26f8418e 100644 (file)
--- a/libs/ardour/ardour/midi_patch_manager.h
+++ b/libs/ardour/ardour/midi_patch_manager.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2008 Hans Baier 
+    Copyright (C) 2008 Hans Baier
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 #ifndef MIDI_PATCH_MANAGER_H_
 #define MIDI_PATCH_MANAGER_H_
 
-#include <midi++/midnam_patch.h>
+#include "midi++/midnam_patch.h"
 
 namespace ARDOUR {
        class Session;
@@ -40,103 +40,102 @@ private:
        MidiPatchManager() {};
        MidiPatchManager( const MidiPatchManager& );
        MidiPatchManager& operator= (const MidiPatchManager&);
-       
-       static MidiPatchManager* _manager; 
-       
+
+       static MidiPatchManager* _manager;
+
 public:
        typedef std::map<std::string, boost::shared_ptr<MIDINameDocument> > MidiNameDocuments;
-       
+
        virtual ~MidiPatchManager() { _manager = 0; }
-       
-       static MidiPatchManager& instance() { 
+
+       static MidiPatchManager& instance() {
                if (_manager == 0) {
                        _manager = new MidiPatchManager();
                }
-               return *_manager; 
+               return *_manager;
        }
-       
+
        void set_session (ARDOUR::Session&);
-       
-       boost::shared_ptr<MIDINameDocument> document_by_model(std::string model_name) 
+
+       boost::shared_ptr<MIDINameDocument> document_by_model(std::string model_name)
                { return _documents[model_name]; }
-       
-       boost::shared_ptr<MasterDeviceNames> master_device_by_model(std::string model_name) 
+
+       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, 
+                       std::string model,
+                       std::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);
+                       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, 
+                       std::string model,
+                       std::string custom_device_mode,
+                       uint8_t channel,
                        PatchPrimaryKey patch_key) {
-               
+
                boost::shared_ptr<ChannelNameSet> channel_name_set = find_channel_name_set(model, custom_device_mode, channel);
-               
+
                if (channel_name_set) {
-                       return  channel_name_set->find_patch(patch_key);                        
+                       return  channel_name_set->find_patch(patch_key);
                } else {
                        return boost::shared_ptr<Patch>();
                }
        }
-       
+
        boost::shared_ptr<Patch> previous_patch(
-                       string model, 
-                       string custom_device_mode, 
-                       uint8_t channel, 
+                       std::string model,
+                       std::string custom_device_mode,
+                       uint8_t channel,
                        PatchPrimaryKey patch_key) {
-               
+
                boost::shared_ptr<ChannelNameSet> channel_name_set = find_channel_name_set(model, custom_device_mode, channel);
-               
+
                if (channel_name_set) {
-                       return  channel_name_set->previous_patch(patch_key);                    
+                       return  channel_name_set->previous_patch(patch_key);
                } else {
                        return boost::shared_ptr<Patch>();
                }
        }
-       
+
        boost::shared_ptr<Patch> next_patch(
-                       string model, 
-                       string custom_device_mode, 
-                       uint8_t channel, 
+                       std::string model,
+                       std::string custom_device_mode,
+                       uint8_t channel,
                        PatchPrimaryKey patch_key) {
-               
+
                boost::shared_ptr<ChannelNameSet> channel_name_set = find_channel_name_set(model, custom_device_mode, channel);
-               
+
                if (channel_name_set) {
-                       return  channel_name_set->next_patch(patch_key);                        
+                       return  channel_name_set->next_patch(patch_key);
                } else {
                        return boost::shared_ptr<Patch>();
                }
        }
-       
-       std::list<string> custom_device_mode_names_by_model(std::string model_name) {
+
+       std::list<std::string> custom_device_mode_names_by_model(std::string model_name) {
                if (model_name != "") {
                        return master_device_by_model(model_name)->custom_device_mode_names();
                } else {
-                       return std::list<string>();
+                       return std::list<std::string>();
                }
        }
-       
+
        const MasterDeviceNames::Models& all_models() const { return _all_models; }
-       
+
 private:
        void drop_session();
        void refresh();
-       
+
        ARDOUR::Session*                        _session;
        MidiNameDocuments                       _documents;
        MIDINameDocument::MasterDeviceNamesList _master_devices_by_model;