Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
23c59e8c
Commit
23c59e8c
authored
Oct 23, 2004
by
Warren Dukes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wee found the audioFormatConversion bug, was actually a bug in shout plugin
git-svn-id:
https://svn.musicpd.org/mpd/trunk@2311
09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent
48002320
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
audioOutput.h
src/audioOutput.h
+6
-0
audioOutput_shout.c
src/audioOutput_shout.c
+1
-1
pcm_utils.c
src/pcm_utils.c
+1
-1
No files found.
src/audioOutput.h
View file @
23c59e8c
...
...
@@ -40,6 +40,8 @@ typedef int (* AudioOutputPlayFunc) (AudioOutput * audioOutput,
typedef
void
(
*
AudioOutputCloseDeviceFunc
)
(
AudioOutput
*
audioOutput
);
typedef
int
(
*
AudioOutputKeepAliveFunc
)
(
AudioOutput
*
audioOutput
,
int
ms
);
struct
_AudioOutput
{
int
open
;
...
...
@@ -47,17 +49,20 @@ struct _AudioOutput {
AudioOutputOpenDeviceFunc
openDeviceFunc
;
AudioOutputPlayFunc
playFunc
;
AudioOutputCloseDeviceFunc
closeDeviceFunc
;
AudioOutputKeepAliveFunc
keepAliveFunc
;
void
*
data
;
};
typedef
struct
_AudioOutputPlugin
{
char
*
name
;
AudioOutputInitDriverFunc
initDriverFunc
;
AudioOutputFinishDriverFunc
finishDriverFunc
;
AudioOutputOpenDeviceFunc
openDeviceFunc
;
AudioOutputPlayFunc
playFunc
;
AudioOutputCloseDeviceFunc
closeDeviceFunc
;
AudioOutputKeepAliveFunc
keepAliveFunc
;
}
AudioOutputPlugin
;
void
initAudioOutputPlugins
();
...
...
@@ -71,5 +76,6 @@ int openAudioOutput(AudioOutput * audioOutput, AudioFormat * audioFormat);
int
playAudioOutput
(
AudioOutput
*
audioOutput
,
char
*
playChunk
,
int
size
);
void
closeAudioOutput
(
AudioOutput
*
audioOutput
);
void
finishAudioOutput
(
AudioOutput
*
audioOutput
);
int
keepAudioOutputAlive
(
AudioOutput
*
audioOutput
,
int
ms
);
#endif
src/audioOutput_shout.c
View file @
23c59e8c
...
...
@@ -321,7 +321,7 @@ static int shout_play(AudioOutput * audioOutput, char * playChunk, int size) {
}
}
vorbis_analysis_wrote
(
&
(
sd
->
vd
),
s
ize
/
4
);
vorbis_analysis_wrote
(
&
(
sd
->
vd
),
s
amples
);
while
(
1
==
vorbis_analysis_blockout
(
&
(
sd
->
vd
),
&
(
sd
->
vb
)))
{
vorbis_analysis
(
&
(
sd
->
vb
),
NULL
);
...
...
src/pcm_utils.c
View file @
23c59e8c
...
...
@@ -306,7 +306,7 @@ size_t pcm_sizeOfOutputBufferForAudioFormatConversion(AudioFormat * inFormat,
outSize
=
(
outSize
>>
1
)
<<
2
;
break
;
case
2
:
//
outSize >>= 1;
outSize
>>=
1
;
break
;
}
}
...
...
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