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
89367896
Commit
89367896
authored
Mar 13, 2005
by
Warren Dukes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add OS X configure stuff and added a skeleton audioOutput plugin for OS X
git-svn-id:
https://svn.musicpd.org/mpd/trunk@3074
09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent
3d81a723
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
125 additions
and
0 deletions
+125
-0
configure.ac
configure.ac
+13
-0
Makefile.am
src/Makefile.am
+1
-0
audio.c
src/audio.c
+2
-0
audioOutput_osx.c
src/audioOutputs/audioOutput_osx.c
+109
-0
No files found.
configure.ac
View file @
89367896
...
...
@@ -102,6 +102,13 @@ AP_maGiC_VALUE
)
fi
enable_osx=no
case $host in
*-darwin*)
AC_DEFINE(HAVE_OSX, 1, [Define for compiling OS X support])
enable_osx=yes ;;
esac
if test x$enable_ogg = xno; then
AC_MSG_WARN("disabling shout streaming support since vorbis was not found")
fi
...
...
@@ -582,6 +589,12 @@ else
echo "Playing audio via ALSA ........disabled"
fi
if test x$enable_osx = xyes; then
echo "Playing audio on OS X .........enabled"
else
echo "Playing audio on OS X .........disabled"
fi
if test x$enable_shout = xyes; then
echo "Streaming through shout .......enabled"
else
...
...
src/Makefile.am
View file @
89367896
...
...
@@ -5,6 +5,7 @@ mpd_audioOutputs = \
audioOutputs/audioOutput_alsa.c
\
audioOutputs/audioOutput_ao.c
\
audioOutputs/audioOutput_oss.c
\
audioOutputs/audioOutput_osx.c
\
audioOutputs/audioOutput_shout.c
mpd_inputPlugins
=
\
...
...
src/audio.c
View file @
89367896
...
...
@@ -59,6 +59,7 @@ int cmpAudioFormat(AudioFormat * f1, AudioFormat * f2) {
extern
AudioOutputPlugin
alsaPlugin
;
extern
AudioOutputPlugin
aoPlugin
;
extern
AudioOutputPlugin
ossPlugin
;
extern
AudioOutputPlugin
osxPlugin
;
extern
AudioOutputPlugin
shoutPlugin
;
/* make sure initPlayerData is called before this function!! */
...
...
@@ -70,6 +71,7 @@ void initAudioDriver() {
loadAudioOutputPlugin
(
&
alsaPlugin
);
loadAudioOutputPlugin
(
&
aoPlugin
);
loadAudioOutputPlugin
(
&
ossPlugin
);
loadAudioOutputPlugin
(
&
osxPlugin
);
loadAudioOutputPlugin
(
&
shoutPlugin
);
pdAudioDevicesEnabled
=
(
getPlayerData
())
->
audioDeviceEnabled
;
...
...
src/audioOutputs/audioOutput_osx.c
0 → 100644
View file @
89367896
/* the Music Player Daemon (MPD)
* (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
* This project's homepage is: http://www.musicpd.org
*
* 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 2 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../audioOutput.h"
#ifdef HAVE_OSX
#include "../conf.h"
#include "../log.h"
#include <stdlib.h>
typedef
struct
_OsxData
{
}
OsxData
;
static
OsxData
*
newOsxData
()
{
OsxData
*
ret
=
malloc
(
sizeof
(
OsxData
));
return
ret
;
}
static
int
osx_initDriver
(
AudioOutput
*
audioOutput
,
ConfigParam
*
param
)
{
OsxData
*
od
=
newOsxData
();
audioOutput
->
data
=
od
;
return
0
;
}
static
void
freeOsxData
(
OsxData
*
od
)
{
free
(
od
);
}
static
void
osx_finishDriver
(
AudioOutput
*
audioOutput
)
{
OsxData
*
od
=
(
OsxData
*
)
audioOutput
->
data
;
freeOsxData
(
od
);
}
static
void
osx_dropBufferedAudio
(
AudioOutput
*
audioOutput
)
{
/* not implemented yet */
}
static
void
osx_closeDevice
(
AudioOutput
*
audioOutput
)
{
//OsxData * od = (OsxData *) audioOutput->data;
audioOutput
->
open
=
0
;
}
static
int
osx_openDevice
(
AudioOutput
*
audioOutput
)
{
//OsxData * od = (OsxData *)audioOutput->data;
audioOutput
->
open
=
1
;
return
0
;
}
static
int
osx_play
(
AudioOutput
*
audioOutput
,
char
*
playChunk
,
int
size
)
{
//OsxData * od = (OsxData *)audioOutput->data;
return
0
;
}
AudioOutputPlugin
osxPlugin
=
{
"osx"
,
NULL
,
osx_initDriver
,
osx_finishDriver
,
osx_openDevice
,
osx_play
,
osx_dropBufferedAudio
,
osx_closeDevice
,
NULL
/* sendMetadataFunc */
};
#else
#include <stdio.h>
AudioOutputPlugin
osxPlugin
=
{
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
};
#endif
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