Rename CardInfo to MidiDevice and factor out some device probing logic

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 18 matching lines @@
 
   // MidiManager implementation.
   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, UdevEscape);
 
-  class CardInfo {
+  class MidiDevice {
    public:
-    CardInfo(const MidiManagerAlsa* outer,
-             const std::string& alsa_name, const std::string& alsa_longname,
-             const std::string& alsa_driver, int card_index);
-    ~CardInfo();
+    MidiDevice(const MidiManagerAlsa* outer,
+               const std::string& alsa_name,
+               const std::string& alsa_longname,
+               const std::string& alsa_driver,
+               int card_index);
+    ~MidiDevice();

[Takashi Toyoshima, 2015/03/16 07:22:08]

Can you just remove the destructor?
Since it does not have any implementation.

[Adam Goode, 2015/03/16 20:30:54]

When I do this I get:

In file included from ../../media/midi/midi_manager_alsa.cc:5:
../../media/midi/midi_manager_alsa.h:40:3: error: [chromium-style] Complex
class/struct needs an explicit out-of-line destructor.
  class MidiDevice {
  ^
1 error generated.

 
     const std::string alsa_name() const;
     const std::string manufacturer() const;
     const std::string alsa_driver() const;
     const std::string udev_id_path() const;
     const std::string udev_id_id() const;
 
    private:
     FRIEND_TEST_ALL_PREFIXES(MidiManagerAlsaTest, ExtractManufacturer);
-    FRIEND_TEST_ALL_PREFIXES(MidiManagerAlsaTest, UdevEscape);
 
     // 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 manufacturer_;
     std::string alsa_driver_;
     std::string udev_id_path_;
     std::string udev_id_id_;

[Takashi Toyoshima, 2015/03/16 07:22:08]

It seems we forgot to add DISALLOW_COPY_AND_ASSIGN for this inner class in the
previous changes.

[Adam Goode, 2015/03/16 20:30:54]

done

   };
 
+  // Returns an ordered vector of all the rawmidi devices on the system.
+  ScopedVector<MidiDevice> AllMidiDevices();
+
+  // 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 EventReset();
+  void ScheduleEventLoop();
   void EventLoop();
+  void ProcessSingleEvent(snd_seq_event_t* event, double timestamp);
 
-  // Alsa seq handles.
+  // ALSA seq handles.
   snd_seq_t* in_client_;
   snd_seq_t* out_client_;
   int out_client_id_;
 
   // One input port, many output ports.
   int in_port_;
   std::vector<int> out_ports_;
 
-  // Mapping from Alsa client:port to our index.
+  // Mapping from ALSA client:port to our index.
   typedef std::map<int, uint32> SourceMap;
   SourceMap source_map_;
 
-  // Alsa event <-> MIDI coders.
+  // ALSA event <-> MIDI coders.
   snd_midi_event_t* decoder_;
   typedef std::vector<snd_midi_event_t*> EncoderList;
   EncoderList encoders_;
 
   // udev, for querying hardware devices.
 #if defined(USE_UDEV)
   device::ScopedUdevPtr udev_;
 #endif  // defined(USE_UDEV)
 
   base::Thread send_thread_;
   base::Thread event_thread_;
 
   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_