Rename AlsaRawmidi to AlsaCard and include the count of midi devices instead of duplicating

media/midi/midi_manager_alsa.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_MIDI_MIDI_MANAGER_ALSA_H_
 #define MEDIA_MIDI_MIDI_MANAGER_ALSA_H_
 
 #include <alsa/asoundlib.h>
 #include <map>
 #include <vector>
@@ skipping 21 matching lines @@
   void StartInitialization() override;
   void DispatchSendMidiData(MidiManagerClient* client,
                             uint32 port_index,
                             const std::vector<uint8>& data,
                             double timestamp) override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(MidiManagerAlsaTest, ExtractManufacturer);
   FRIEND_TEST_ALL_PREFIXES(MidiManagerAlsaTest, JSONPortMetadata);
 
-  class AlsaRawmidi {
+  class AlsaCard {
    public:
-    AlsaRawmidi(const MidiManagerAlsa* outer,
-                const std::string& alsa_name,
-                const std::string& alsa_longname,
-                const std::string& alsa_driver,
-                int card_index);
-    ~AlsaRawmidi();
+    AlsaCard(const MidiManagerAlsa* outer,
+             const std::string& alsa_name,
+             const std::string& alsa_longname,
+             const std::string& alsa_driver,
+             int card_index,
+             int midi_count);
+    ~AlsaCard();
 
     const std::string alsa_name() const;
     const std::string alsa_longname() const;
     const std::string manufacturer() const;
     const std::string alsa_driver() const;
     const std::string path() const;
     const std::string bus() const;
     const std::string vendor_id() const;
     const std::string id() const;
+    const int midi_count() const;
 
    private:
     FRIEND_TEST_ALL_PREFIXES(MidiManagerAlsaTest, ExtractManufacturer);
 
     // Extracts the manufacturer using heuristics and a variety of sources.
     static std::string ExtractManufacturerString(
         const std::string& udev_id_vendor,
         const std::string& udev_id_vendor_id,
         const std::string& udev_id_vendor_from_database,
         const std::string& alsa_name,
         const std::string& alsa_longname);
 
     std::string alsa_name_;
     std::string alsa_longname_;
     std::string manufacturer_;
     std::string alsa_driver_;
     std::string path_;
     std::string bus_;
     std::string vendor_id_;
     std::string model_id_;
     std::string usb_interface_num_;
+    int midi_count_;
 
-    DISALLOW_COPY_AND_ASSIGN(AlsaRawmidi);
+    DISALLOW_COPY_AND_ASSIGN(AlsaCard);
   };
 
   class AlsaPortMetadata {
    public:
     enum class Type { kInput, kOutput };
 
     AlsaPortMetadata(const std::string& path,
                      const std::string& bus,
                      const std::string& id,
                      const snd_seq_addr_t* address,
@@ skipping 25 matching lines @@
     const int port_addr_;
     const std::string client_name_;
     const std::string port_name_;
     const std::string card_name_;
     const std::string card_longname_;
     const Type type_;
 
     DISALLOW_COPY_AND_ASSIGN(AlsaPortMetadata);
   };
 
-  // Returns an ordered vector of all the rawmidi devices on the system.
-  ScopedVector<AlsaRawmidi> AllAlsaRawmidis();
+  // Returns an ordered vector of all the cards with MIDI capabilities.
+  ScopedVector<AlsaCard> AllMidiCards();
 
   // Enumerate all the ports for initial setup.
   void EnumeratePorts();
 
   // An internal callback that runs on MidiSendThread.
   void SendMidiData(uint32 port_index,
                     const std::vector<uint8>& data);
 
   void ScheduleEventLoop();
   void EventLoop();
@@ skipping 25 matching lines @@
 
   bool event_thread_shutdown_; // guarded by shutdown_lock_
   base::Lock shutdown_lock_; // guards event_thread_shutdown_
 
   DISALLOW_COPY_AND_ASSIGN(MidiManagerAlsa);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MIDI_MIDI_MANAGER_ALSA_H_