Commit 6f01d431 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

[#2165] Add class recordable from which inherit call and conference

parent 6ab63073
......@@ -28,6 +28,7 @@ libaudio_la_SOURCES = \
audioloop.cpp \
ringbuffer.cpp \
mainbuffer.cpp \
recordable.cpp \
$(SPEEX_SOURCES_CPP)
noinst_HEADERS = \
......@@ -47,5 +48,6 @@ noinst_HEADERS = \
codecDescriptor.h \
dtmf.h \
mainbuffer.h \
recordable.h \
tone.h
......@@ -2,6 +2,7 @@
* Copyright (C) 2004-2008 Savoir-Faire Linux inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
......
/*
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
* Copyright (C) 2004-2009 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
*
* Portions Copyright (C) Dominic Mazzoni (Audacity)
*
......
......@@ -24,7 +24,8 @@
#include <cc++/thread.h> // for mutex
#include <sstream>
#include "plug-in/audiorecorder/audiorecord.h"
// #include "plug-in/audiorecorder/audiorecord.h"
#include "audio/recordable.h"
#define IP_TO_IP_PATTERN "sip:"
......@@ -40,7 +41,7 @@ static CallID default_id = "default_id";
class AudioRecord;
class Call{
class Call: public Recordable{
public:
/**
......@@ -219,7 +220,7 @@ class Call{
/**
* A recorder for this call
*/
AudioRecord recAudio;
// AudioRecord recAudio;
/**
* SetRecording
......
......@@ -21,6 +21,7 @@
#include <set>
#include "audio/recordable.h"
#include "call.h"
// class ManagerImpl;
......@@ -30,7 +31,7 @@ typedef std::string ConfID;
typedef std::set<CallID> ParticipantSet;
class Conference{
class Conference: public Recordable{
public:
......@@ -70,6 +71,12 @@ class Conference{
ParticipantSet _participants;
int _nbParticipant;
/**
* An audio recorder for this conference
*/
// AudioRecord recAudio;
};
// Conference::count = 0;
......
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