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
0cfe09f6
Commit
0cfe09f6
authored
17 years ago
by
Alexandre Bourget
Browse files
Options
Downloads
Patches
Plain Diff
Temporary commit.
parent
a203e3c8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/config/config.cpp
+12
-2
12 additions, 2 deletions
src/config/config.cpp
src/iaxvoiplink.cpp
+2
-8
2 additions, 8 deletions
src/iaxvoiplink.cpp
with
14 additions
and
10 deletions
src/config/config.cpp
+
12
−
2
View file @
0cfe09f6
...
...
@@ -99,7 +99,14 @@ ConfigTree::getConfigTreeItemValue(const std::string& section, const std::string
return
item
->
getValue
();
}
else
{
_debug
(
"Option doesn't exist: [%s] %s
\n
"
,
section
.
c_str
(),
itemName
.
c_str
());
//throw ConfigTreeItemException();
/** @todo If item doesn't exist, we should check against the default values for those
* types of information, and return the default value.
* ...
* Maybe this should be implemented when called ? When we need a bit of configuration,
* we call the getConfig with a defaultValue as parameter, in that context we know best
* what would be the default value, rather than inside this generic configuration
* management class.
*/
}
return
""
;
}
...
...
@@ -108,7 +115,10 @@ ConfigTree::getConfigTreeItemValue(const std::string& section, const std::string
int
ConfigTree
::
getConfigTreeItemIntValue
(
const
std
::
string
&
section
,
const
std
::
string
&
itemName
)
{
return
atoi
(
getConfigTreeItemValue
(
section
,
itemName
).
data
());
std
::
string
configItem
=
getConfigTreeItemValue
(
section
,
itemName
);
int
retval
=
atoi
(
configItem
.
data
());
return
retval
;
}
bool
...
...
This diff is collapsed.
Click to expand it.
src/iaxvoiplink.cpp
+
2
−
8
View file @
0cfe09f6
...
...
@@ -31,11 +31,6 @@
#include
<math.h>
/** @todo Remove the fstream and iostream stuff */
//#include <fstream> // fstream + iostream pour fstream debugging..
//#include <iostream> // removeable...
#define IAX_BLOCKING 1
#define IAX_NONBLOCKING 0
...
...
@@ -46,8 +41,8 @@
// from IAXC : iaxclient.h
#define IAX__20S_8KHZ_MAX
160 //
320 //320 samples
#define IAX__20S_48KHZ_MAX
960 //
1920 // 320*6 samples = 1920, 6 = 48000/8000
#define IAX__20S_8KHZ_MAX 320 //320 samples
, IAX packets can have more than 20ms.
#define IAX__20S_48KHZ_MAX 1920 // 320*6 samples = 1920, 6 = 48000/8000
#define CHK_VALID_CALL if (call == NULL) { _debug("IAX: Call doesn't exists\n"); \
return false; }
...
...
@@ -56,7 +51,6 @@
IAXVoIPLink
::
IAXVoIPLink
(
const
AccountID
&
accountID
)
:
VoIPLink
(
accountID
)
// , _fstream("/tmp/audio.dat", std::ofstream::binary) /** @todo Remove this */
{
_evThread
=
new
EventThread
(
this
);
_regSession
=
NULL
;
...
...
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