LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Yet more ALSA fixes 

git-svn-id: svn://svn.savannah.nongnu.org/lash/trunk@39 1de19dc7-4e3f-0410-a61d-eddf686bf0b7
This commit is contained in:
Dave Robillard 2006-05-24 02:30:52 +00:00
parent ad0f23e579
commit 3fd646bf16
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lashd/alsa_client.h
View File

@ -21,7 +21,9 @@
#ifndef __LASH_ALSA_CLIENT_H__
#define __LASH_ALSA_CLIENT_H__
#ifdef WITH_ALSA
#include "config.h"
#ifdef HAVE_ALSA
#include <pthread.h>
#include <uuid/uuid.h>
@ -51,6 +53,6 @@ void alsa_client_get_id (const alsa_client_t * client, uuid_t
void alsa_client_free_patches (alsa_client_t * client);
void alsa_client_free_backup_patches (alsa_client_t * client);
#endif /* WITH_ALSA */
#endif /* HAVE_ALSA */
#endif /* __LASH_ALSA_CLIENT_H__ */

6
lashd/alsa_fport.h
View File

@ -21,7 +21,9 @@
#ifndef __LASHD_ALSA_FPORT_H__
#define __LASHD_ALSA_FPORT_H__
#ifdef WITH_ALSA
#include "config.h"
#ifdef HAVE_ALSA
#include <pthread.h>
@ -43,6 +45,6 @@ void alsa_fport_set_port (alsa_fport_t * fport, unsigned char port);
unsigned char alsa_fport_get_client (const alsa_fport_t * fport);
unsigned char alsa_fport_get_port (const alsa_fport_t * fport);
#endif /* WITH_ALSA */
#endif /* HAVE_ALSA */
#endif /* __LASHD_ALSA_FPORT_H__ */

6
lashd/alsa_mgr.h
View File

@ -21,7 +21,9 @@
#ifndef __LASH_ALSA_MGR_H__
#define __LASH_ALSA_MGR_H__
#ifdef WITH_ALSA
#include "config.h"
#ifdef HAVE_ALSA
#include <pthread.h>
#include <uuid/uuid.h>
@ -62,6 +64,6 @@ void alsa_mgr_unlock (alsa_mgr_t * alsa_mgr);
const char * get_alsa_port_name_only (const char * port_name);
#endif /* WITH_ALSA */
#endif /* HAVE_ALSA */
#endif /* __LASH_ALSA_MGR_H__ */

6
lashd/alsa_patch.h
View File

@ -21,7 +21,9 @@
#ifndef __LASHD_ALSA_PATCH_H__
#define __LASHD_ALSA_PATCH_H__
#ifdef WITH_ALSA
#include "config.h"
#ifdef HAVE_ALSA
#include <uuid/uuid.h>
#include <alsa/asoundlib.h>
@ -70,6 +72,6 @@ void alsa_patch_parse_xml (alsa_patch_t * patch, xmlNodePtr parent);
const char * alsa_patch_get_desc (alsa_patch_t * patch);
#endif /* WITH_ALSA */
#endif /* HAVE_ALSA */
#endif /* __LASHD_ALSA_PATCH_H__ */

3
lashd/server.h
View File

@ -24,6 +24,7 @@
#include <lash/lash.h>
#include <lash/loader.h>
#include "config.h"
#include "conn_mgr.h"
#include "client.h"
#include "project.h"
@ -36,7 +37,7 @@ struct _server
{
conn_mgr_t * conn_mgr;
jack_mgr_t * jack_mgr;
#ifdef WITH_ALSA
#ifdef HAVE_ALSA
alsa_mgr_t * alsa_mgr;
#else
void * alsa_mgr;