summaryrefslogtreecommitdiffstats
path: root/media/midi
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-17 13:13:58 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-17 13:13:58 +0000
commit2903e6a6250e433b41a73fca52a3d90f131278f8 (patch)
tree3bd0ed48442ff3ca79a13716527d2a864e34070c /media/midi
parent87492b921e92a0b81881cf1e3f18f5af55c64c82 (diff)
downloadchromium_src-2903e6a6250e433b41a73fca52a3d90f131278f8.zip
chromium_src-2903e6a6250e433b41a73fca52a3d90f131278f8.tar.gz
chromium_src-2903e6a6250e433b41a73fca52a3d90f131278f8.tar.bz2
mac: Remove a static initializer.
BUG=94925,94794 NOTRY=true Review URL: https://codereview.chromium.org/27423003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/midi')
-rw-r--r--media/midi/midi_manager_mac.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/media/midi/midi_manager_mac.cc b/media/midi/midi_manager_mac.cc
index 4477944..42de02e 100644
--- a/media/midi/midi_manager_mac.cc
+++ b/media/midi/midi_manager_mac.cc
@@ -4,7 +4,6 @@
#include "media/midi/midi_manager_mac.h"
-#include <iostream>
#include <string>
#include "base/debug/trace_event.h"
@@ -110,6 +109,7 @@ MIDIManagerMac::~MIDIManagerMac() {
MIDIPortDispose(coremidi_output_);
}
+// static
void MIDIManagerMac::ReadMIDIDispatch(const MIDIPacketList* packet_list,
void* read_proc_refcon,
void* src_conn_refcon) {
@@ -177,6 +177,7 @@ void MIDIManagerMac::SendMIDIData(MIDIManagerClient* client,
client->AccumulateMIDIBytesSent(data.size());
}
+// static
MIDIPortInfo MIDIManagerMac::GetPortInfoFromEndpoint(
MIDIEndpointRef endpoint) {
SInt32 id_number = 0;
@@ -200,11 +201,13 @@ MIDIPortInfo MIDIManagerMac::GetPortInfoFromEndpoint(
return MIDIPortInfo(id, manufacturer, name, version);
}
+// static
double MIDIManagerMac::MIDITimeStampToSeconds(MIDITimeStamp timestamp) {
UInt64 nanoseconds = AudioConvertHostTimeToNanos(timestamp);
return static_cast<double>(nanoseconds) / 1.0e9;
}
+// static
MIDITimeStamp MIDIManagerMac::SecondsToMIDITimeStamp(double seconds) {
UInt64 nanos = UInt64(seconds * 1.0e9);
return AudioConvertNanosToHostTime(nanos);