Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
af96b3a9
Commit
af96b3a9
authored
13 years ago
by
Rafaël Carré
Browse files
Options
Downloads
Patches
Plain Diff
* #6629 : remove unused AudioDevice
parent
25dd0d2a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
daemon/src/audio/Makefile.am
+0
-2
0 additions, 2 deletions
daemon/src/audio/Makefile.am
daemon/src/audio/audiodevice.cpp
+0
-45
0 additions, 45 deletions
daemon/src/audio/audiodevice.cpp
daemon/src/audio/audiodevice.h
+0
-106
0 additions, 106 deletions
daemon/src/audio/audiodevice.h
with
0 additions
and
153 deletions
daemon/src/audio/Makefile.am
+
0
−
2
View file @
af96b3a9
...
...
@@ -12,7 +12,6 @@ libaudio_la_SOURCES = \
audiorecorder.cpp
\
recordable.cpp
\
audiolayer.cpp
\
audiodevice.cpp
\
samplerateconverter.cpp
\
delaydetection.cpp
\
echocancel.cpp
\
...
...
@@ -32,7 +31,6 @@ noinst_HEADERS = \
audiorecord.h
\
audiorecorder.h
\
audiolayer.h
\
audiodevice.h
\
recordable.h
\
algorithm.h
\
delaydetection.h
\
...
...
This diff is collapsed.
Click to expand it.
daemon/src/audio/audiodevice.cpp
deleted
100644 → 0
+
0
−
45
View file @
25dd0d2a
/*
* Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#include
"audiodevice.h"
#include
"../global.h"
const
double
AudioDevice
::
DEFAULT_RATE
=
8000.0
;
AudioDevice
::
AudioDevice
(
int
id
,
const
std
::
string
&
name
)
:
_id
(
id
),
_name
(
name
),
_rate
(
DEFAULT_RATE
)
{
_rate
=
DEFAULT_RATE
;
}
AudioDevice
::~
AudioDevice
()
{
}
This diff is collapsed.
Click to expand it.
daemon/src/audio/audiodevice.h
deleted
100644 → 0
+
0
−
106
View file @
25dd0d2a
/*
* Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#ifndef _AUDIO_DEVICE_H
#define _AUDIO_DEVICE_H
#include
<string>
#define AUDIODEVICERATE 8000
/**
* @file audiodevice.h
* @brief Container device for attribute storage
* Have almost only get/set method
*/
class
AudioDevice
{
public:
/**
* Constructor
* @param id Identifier
* @param name Name
*/
AudioDevice
(
int
id
,
const
std
::
string
&
name
);
/**
* Destructor
*/
~
AudioDevice
();
/** Default sample rate */
const
static
double
DEFAULT_RATE
;
/**
* Read accessor to the ID
* @return int The ID of the audiodevice
*/
int
getId
()
{
return
_id
;
}
/**
* Read accessor to the name
* @return std::string& A string description
*/
const
std
::
string
&
getName
()
{
return
_name
;
}
/**
* Write accessor to the sample rate
* @param rate The sample rate
*/
void
setRate
(
double
rate
)
{
_rate
=
rate
;
}
/**
* Read accessor to the sample rate
* @return double The sample rate
*/
double
getRate
()
{
return
_rate
;
}
private
:
/** Integer id of the device, can not be 0 */
int
_id
;
/** Name of the device */
std
::
string
_name
;
/** Default rate in Hz, like 8000.0, default is AudioDevice::DEFAULT_RATE */
double
_rate
;
};
#endif // _AUDIO_DEVICE_H_
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment