diff options
author | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-01-02 16:06:39 +0000 |
---|---|---|
committer | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-01-02 16:06:39 +0000 |
commit | 00c7c4315b2cc0caa3b4612d3e71fc82b9e43832 (patch) | |
tree | ac877a03f8ffff3599c31b813154e81d02d778b3 /webrtc/voice_engine/voice_engine_defines.h | |
parent | 943770b1ab5e0d23bb4249f60ca1cea7acd0d6d9 (diff) | |
download | webrtc-00c7c4315b2cc0caa3b4612d3e71fc82b9e43832.tar.gz |
Replace voice engine utility functions with system wrapper variants.
SLEEP -> SleepMs
GET_TIME_IN_MS -> TickTime::MillisecondTimestamp
These could cause unused function errors on some compilers.
BUG=1228
Review URL: https://webrtc-codereview.appspot.com/1013004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3326 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/voice_engine/voice_engine_defines.h')
-rw-r--r-- | webrtc/voice_engine/voice_engine_defines.h | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/webrtc/voice_engine/voice_engine_defines.h b/webrtc/voice_engine/voice_engine_defines.h index f840aa95ed..78bda78799 100644 --- a/webrtc/voice_engine/voice_engine_defines.h +++ b/webrtc/voice_engine/voice_engine_defines.h @@ -271,10 +271,7 @@ enum { kVoiceEngineMaxNumOfActiveChannels = 16 }; // ---------------------------------------------------------------------------- #include <windows.h> - #include <mmsystem.h> // timeGetTime - #define GET_TIME_IN_MS() ::timeGetTime() - #define SLEEP(x) ::Sleep(x) // Comparison of two strings without regard to case #define STR_CASE_CMP(x,y) ::_stricmp(x,y) // Compares characters of two strings without regard to case @@ -338,31 +335,6 @@ enum { kVoiceEngineMaxNumOfActiveChannels = 16 }; #define __cdecl #define LPSOCKADDR struct sockaddr * -namespace -{ - void Sleep(unsigned long x) - { - timespec t; - t.tv_sec = x/1000; - t.tv_nsec = (x-(x/1000)*1000)*1000000; - nanosleep(&t,NULL); - } - - DWORD timeGetTime() - { - struct timeval tv; - struct timezone tz; - unsigned long val; - - gettimeofday(&tv, &tz); - val= tv.tv_sec*1000+ tv.tv_usec/1000; - return(val); - } -} - -#define SLEEP(x) ::Sleep(x) -#define GET_TIME_IN_MS timeGetTime - // Default device for Linux and Android #define WEBRTC_VOICE_ENGINE_DEFAULT_DEVICE 0 @@ -488,31 +460,6 @@ namespace webrtc #define LPCSTR const char* #define ULONG unsigned long -namespace -{ - void Sleep(unsigned long x) - { - timespec t; - t.tv_sec = x/1000; - t.tv_nsec = (x-(x/1000)*1000)*1000000; - nanosleep(&t,NULL); - } - - DWORD WebRtcTimeGetTime() - { - struct timeval tv; - struct timezone tz; - unsigned long val; - - gettimeofday(&tv, &tz); - val= tv.tv_sec*1000+ tv.tv_usec/1000; - return(val); - } -} - -#define SLEEP(x) ::Sleep(x) -#define GET_TIME_IN_MS WebRtcTimeGetTime - // Default device for Mac and iPhone #define WEBRTC_VOICE_ENGINE_DEFAULT_DEVICE 0 |