Commit 5770f092 authored by sfl's avatar sfl

Modification fichier include

parent fff7960c
......@@ -4,9 +4,9 @@
#define AUDIOMIXER_H
#include <cc++/thread.h>
#include <vector>
#include "InternalBuffer.h"
#include "OutputStream.h"
#include <cc++/thread.h>
using namespace std;
/** @interface */
......
......@@ -2,9 +2,7 @@
#ifndef AUDIOSYNCH_H
#define AUDIOSYNCH_H
#include "SynchManager.h"
#include "InputStreams.h"
#include "InternalBuffer.h"
#include "SynchManager.h"
//! Synchonization manager that uses Audio data as reference
/*!
......
......@@ -3,7 +3,7 @@
#ifndef INTERNALBUFFER_H
#define INTERNALBUFFER_H
#include "semaphore.h"
#include <semaphore.h>
//! Internal data sharing class
/*!
......
......@@ -11,7 +11,6 @@ libmixer_la_SOURCES = AudioInput.cpp \
InternalBuffer.cpp \
LocalAudioOuput.cpp \
LocalVideoOuput.cpp \
Mixer.cpp \
NoSynch.cpp \
StraightThrough_AT.cpp \
StraightThrough_VT.cpp \
......@@ -19,9 +18,30 @@ libmixer_la_SOURCES = AudioInput.cpp \
VideoMixer2Channels.cpp \
VideoMixer.cpp \
VideoOutput.cpp \
TimeInfo.cpp
TimeInfo.cpp \
Mixer.cpp
AM_CXXFLAGS = -I$(top_srcdir)/include $(libccext2_CFLAGS) $(USER_INCLUDES)
#AM_CXXFLAGS = $(libccext2_CFLAGS) $(USER_INCLUDES)
noinst_HEADERS = AudioInput.h \
AudioMixer2Channels.h \
AudioMixer.h \
AudioOuput.h \
AudioSynch.h \
InputStreams.h \
InternalBuffer.h \
LocalAudioOuput.h \
LocalVideoOuput.h \
Mixer.h \
NoSynch.h \
OutputStream.h \
StraightThrough_AT.h \
StraightThrough_VT.h \
SynchManager.h \
TimeInfo.h \
VideoInput.h \
VideoMixer2Channels.h \
VideoMixer.h \
VideoOutput.h
......@@ -8,17 +8,14 @@
#include "OutputStream.h"
#include "InputStreams.h"
#include "SynchManager.h"
#include "NoSynch.h"
#include "AudioSynch.h"
#include "InternalBuffer.h"
#include "AudioMixer.h"
#include "StraightThrough_AT.h"
#include "AudioMixer2Channels.h"
#include "VideoMixer.h"
#include "StraightThrough_VT.h"
#include "VideoMixer2Channels.h"
......@@ -33,8 +30,8 @@ enum Tmixer { NOSYNCH_AV_STRAIGHTTHROUGH= 0x0, /*!No Synchronization Manager an
NOSYNCH_AV_MIXER2= 0x02, /*!No Synchronization Manager and audio-video 2 channels mixer */
SYNCH_AV_MIXER2= 0x03, /*!Synchronization Manager and audio-video 2 channels mixer */
NOSYNCH_AUTOSENSE= 0x04, /*!No Synchronization Manager and auto-detect mixer state from input */
SYNCH_AUTOSENSE= 0x05, /*!Synchronization Manager and auto-detect mixer stater from input */
};
SYNCH_AUTOSENSE= 0x05 /*!Synchronization Manager and auto-detect mixer stater from input */
};
//! Audio and video mixer
......
......@@ -5,7 +5,7 @@
#include <semaphore.h>
#define int16 short int
#include "../global.h"
/** @interface */
//! Interface for the output buffers.
......
......@@ -3,8 +3,6 @@
#ifndef STRAIGHTTHROUGH_AT_H
#define STRAIGHTTHROUGH_AT_H
#include "AudioMixer.h"
#include "InternalBuffer.h"
#include "OutputStream.h"
//! Straight Through audio mixer
/*!
......
......@@ -2,9 +2,7 @@
#ifndef STRAIGHTTHROUGH_VT_H
#define STRAIGHTTHROUGH_VT_H
#include "VideoMixer.h"
#include "InternalBuffer.h"
#include "OutputStream.h"
#include "VideoMixer.h"
//! Straight Through video mixer
/*!
......
......@@ -2,11 +2,10 @@
#ifndef SYNCHMANAGER_H
#define SYNCHMANAGER_H
#include <cc++/thread.h>
class InternalBuffer;
class InputStreams;
#include <cc++/thread.h>
#include "InternalBuffer.h"
#include "InputStreams.h"
/** @interface */
//! Synchronization manager interface
......
......@@ -4,7 +4,6 @@
#define VIDEOINPUT_H
#include <semaphore.h>
#include "TimeInfo.h"
//! Video input buffer
......
......@@ -3,8 +3,6 @@
#ifndef VIDEOMIXER2CHANNELS_H
#define VIDEOMIXER2CHANNELS_H
#include "VideoMixer.h"
#include "VideoInput.h"
#include "OutputStream.h"
//! 2 Channel video mixer implementation
/*!
......
Markdown is supported
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