Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
audiowmark
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
audiowmark
Commits
3d5b1d71
Commit
3d5b1d71
authored
Jun 26, 2020
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused n_frames argument from SFOutputStream::open().
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
14c6f9f0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
audiostream.cc
src/audiostream.cc
+1
-1
sfoutputstream.cc
src/sfoutputstream.cc
+5
-5
sfoutputstream.hh
src/sfoutputstream.hh
+3
-3
testlimiter.cc
src/testlimiter.cc
+1
-1
No files found.
src/audiostream.cc
View file @
3d5b1d71
...
...
@@ -89,7 +89,7 @@ AudioOutputStream::create (const string& filename, int n_channels, int sample_ra
{
SFOutputStream
*
sfostream
=
new
SFOutputStream
();
out_stream
.
reset
(
sfostream
);
err
=
sfostream
->
open
(
filename
,
n_channels
,
sample_rate
,
bit_depth
,
n_frames
);
err
=
sfostream
->
open
(
filename
,
n_channels
,
sample_rate
,
bit_depth
);
if
(
err
)
return
nullptr
;
}
...
...
src/sfoutputstream.cc
View file @
3d5b1d71
...
...
@@ -30,15 +30,15 @@ SFOutputStream::~SFOutputStream()
}
Error
SFOutputStream
::
open
(
const
string
&
filename
,
int
n_channels
,
int
sample_rate
,
int
bit_depth
,
size_t
n_frames
)
SFOutputStream
::
open
(
const
string
&
filename
,
int
n_channels
,
int
sample_rate
,
int
bit_depth
)
{
return
open
([
&
]
(
SF_INFO
*
sfinfo
)
{
return
sf_open
(
filename
.
c_str
(),
SFM_WRITE
,
sfinfo
);
},
n_channels
,
sample_rate
,
bit_depth
,
n_frames
);
},
n_channels
,
sample_rate
,
bit_depth
);
}
Error
SFOutputStream
::
open
(
std
::
function
<
SNDFILE
*
(
SF_INFO
*
)
>
open_func
,
int
n_channels
,
int
sample_rate
,
int
bit_depth
,
size_t
n_frames
)
SFOutputStream
::
open
(
std
::
function
<
SNDFILE
*
(
SF_INFO
*
)
>
open_func
,
int
n_channels
,
int
sample_rate
,
int
bit_depth
)
{
assert
(
m_state
==
State
::
NEW
);
...
...
@@ -132,11 +132,11 @@ SFOutputStream::n_channels() const
}
Error
SFOutputStream
::
open
(
vector
<
unsigned
char
>
*
data
,
int
n_channels
,
int
sample_rate
,
int
bit_depth
,
size_t
n_frames
)
SFOutputStream
::
open
(
vector
<
unsigned
char
>
*
data
,
int
n_channels
,
int
sample_rate
,
int
bit_depth
)
{
m_virtual_data
.
mem
=
data
;
return
open
([
&
]
(
SF_INFO
*
sfinfo
)
{
return
sf_open_virtual
(
&
m_virtual_data
.
io
,
SFM_WRITE
,
sfinfo
,
&
m_virtual_data
);
},
n_channels
,
sample_rate
,
bit_depth
,
n_frames
);
},
n_channels
,
sample_rate
,
bit_depth
);
}
src/sfoutputstream.hh
View file @
3d5b1d71
...
...
@@ -41,12 +41,12 @@ class SFOutputStream : public AudioOutputStream
};
State
m_state
=
State
::
NEW
;
Error
open
(
std
::
function
<
SNDFILE
*
(
SF_INFO
*
)
>
open_func
,
int
n_channels
,
int
sample_rate
,
int
bit_depth
,
size_t
n_frames
);
Error
open
(
std
::
function
<
SNDFILE
*
(
SF_INFO
*
)
>
open_func
,
int
n_channels
,
int
sample_rate
,
int
bit_depth
);
public
:
~
SFOutputStream
();
Error
open
(
const
std
::
string
&
filename
,
int
n_channels
,
int
sample_rate
,
int
bit_depth
,
size_t
n_frames
);
Error
open
(
std
::
vector
<
unsigned
char
>
*
data
,
int
n_channels
,
int
sample_rate
,
int
bit_depth
,
size_t
n_frames
);
Error
open
(
const
std
::
string
&
filename
,
int
n_channels
,
int
sample_rate
,
int
bit_depth
);
Error
open
(
std
::
vector
<
unsigned
char
>
*
data
,
int
n_channels
,
int
sample_rate
,
int
bit_depth
);
Error
write_frames
(
const
std
::
vector
<
float
>&
frames
)
override
;
Error
close
()
override
;
int
bit_depth
()
const
override
;
...
...
src/testlimiter.cc
View file @
3d5b1d71
...
...
@@ -104,7 +104,7 @@ main (int argc, char **argv)
fprintf
(
stderr
,
"testlimiter: open input failed: %s
\n
"
,
err
.
message
());
return
1
;
}
err
=
out
.
open
(
argv
[
2
],
in
.
n_channels
(),
in
.
sample_rate
(),
16
,
in
.
n_frames
()
);
err
=
out
.
open
(
argv
[
2
],
in
.
n_channels
(),
in
.
sample_rate
(),
16
);
if
(
err
)
{
fprintf
(
stderr
,
"testlimiter: open output failed: %s
\n
"
,
err
.
message
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment