Commit c970cedf authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #9750: refactored global.h

parent f0e0e2cc
......@@ -22,7 +22,6 @@ libaudio_la_SOURCES = \
noinst_HEADERS = \
audioloop.h \
common.h \
ringbuffer.h \
mainbuffer.h \
audiorecord.h \
......
......@@ -33,6 +33,7 @@
#include "audio/dcblocker.h"
#include "eventthread.h"
#include "audio/samplerateconverter.h"
#include "logger.h"
#include "manager.h"
#include "noncopyable.h"
#include "dbus/configurationmanager.h"
......
......@@ -31,12 +31,12 @@
* as that of the covered work.
*/
#ifndef __AUDIO_LAYER_H__
#define __AUDIO_LAYER_H__
#ifndef AUDIO_LAYER_H_
#define AUDIO_LAYER_H_
#include "cc_thread.h" // for ost::Mutex
#include <sys/time.h>
#include <vector>
#include "ringbuffer.h"
#include "dcblocker.h"
#include "samplerateconverter.h"
......
......@@ -37,6 +37,7 @@
#include <numeric>
#include <cstring>
#include <cassert>
#include "logger.h"
AudioLoop::AudioLoop() : buffer_(0), size_(0), pos_(0), sampleRate_(0)
{}
......
......@@ -33,7 +33,8 @@
#ifndef __AUDIOLOOP_H__
#define __AUDIOLOOP_H__
#include "global.h" // for SFLDataFormat
#include "sfl_data_format.h"
#include <cstring>
#include "noncopyable.h"
/**
......
......@@ -31,6 +31,8 @@
#include "audiorecord.h"
#include <unistd.h>
#include <sstream> // for stringstream
#include <cstdio>
#include "logger.h"
// structure for the wave header
......
......@@ -35,7 +35,7 @@
#include <cstdlib>
#include <memory>
#include "global.h"
#include "sfl_data_format.h"
#include "noncopyable.h"
class AudioRecord {
......
......@@ -30,6 +30,7 @@
#include "audio_rtp_record_handler.h"
#include <fstream>
#include "logger.h"
#include "sip/sipcall.h"
#include "audio/audiolayer.h"
#include "manager.h"
......
......@@ -34,7 +34,7 @@
#include "audio_rtp_session.h"
#include "audio_symmetric_rtp_session.h"
#include "logger.h"
#include "sip/sdp.h"
#include "sip/sipcall.h"
#include "audio/audiolayer.h"
......
......@@ -28,6 +28,7 @@
* as that of the covered work.
*/
#include "audio_srtp_session.h"
#include "logger.h"
#include <openssl/sha.h>
#include <openssl/hmac.h>
......
......@@ -35,6 +35,7 @@
#include "audio_rtp_session.h"
#include "audio_symmetric_rtp_session.h"
#include "audio_rtp_record_handler.h"
#include "logger.h"
#include "sip/sdp.h"
#include "sip/sipcall.h"
#include "audio/audiolayer.h"
......
......@@ -28,13 +28,17 @@
* as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "audio_zrtp_session.h"
#include "zrtp_session_callback.h"
#include "fileutils.h"
#include "sip/sipcall.h"
#include "sip/sdp.h"
#include "audio/audiolayer.h"
#include "logger.h"
#include "manager.h"
#include <libzrtpcpp/zrtpccrtp.h>
......
......@@ -28,7 +28,7 @@
* as that of the covered work.
*/
#include "zrtp_session_callback.h"
#include "global.h"
#include "logger.h"
#include "sip/sipcall.h"
#include "dbus/dbusmanager.h"
#include "dbus/callmanager.h"
......
......@@ -29,8 +29,7 @@
* as that of the covered work.
*/
#include "global.h"
#include "../common.h"
#include "sfl_data_format.h"
#include "audiocodec.h"
#include <cassert>
......
......@@ -31,11 +31,15 @@
* as that of the covered work.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "audiocodecfactory.h"
#include <cstdlib>
#include <algorithm> // for std::find
#include "fileutils.h"
#include "logger.h"
AudioCodecFactory::AudioCodecFactory() :
codecsMap_(), defaultCodecOrder_(), libCache_(), codecInMemory_()
......
......@@ -30,11 +30,8 @@
* as that of the covered work.
*/
#include "global.h"
#include "../common.h"
#include "audiocodec.h"
#include "sfl_data_format.h"
#include "g722.h"
#include "noncopyable.h"
......
......@@ -29,10 +29,8 @@
* as that of the covered work.
*/
#include "global.h"
#include "../common.h"
#include "audiocodec.h"
#include "sfl_data_format.h"
#include <cassert>
class Ulaw : public sfl::AudioCodec {
......
......@@ -31,7 +31,7 @@
#ifndef DCBLOCKER_H
#define DCBLOCKER_H
#include "global.h"
#include "sfl_data_format.h"
class DcBlocker {
public:
......
......@@ -32,7 +32,7 @@
#ifndef DELAYDETECTION_H
#define DELAYDETECTION_H
#include "global.h"
#include "sfl_data_format.h"
#include <vector>
// Template size in samples for correlation
......
......@@ -7,7 +7,7 @@
#include <cassert>
#include <stdexcept>
#include "logger.h"
#include "echosuppress.h"
#include "pj/pool.h"
#include "pj/os.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment