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

alsapid: make it work again 

c62134ca6e broke alsapid
This commit is contained in:
Nedko Arnaudov 2011-10-02 02:30:46 +03:00
parent f42b4fbef7
commit 36ef11202b
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
alsapid/alsapid.h
View File

@ -2,7 +2,7 @@
/* /*
* LADI Session Handler (ladish) * LADI Session Handler (ladish)
* *
* Copyright (C) 2010 Nedko Arnaudov <nedko@arnaudov.name> * Copyright (C) 2010, 2011 Nedko Arnaudov <nedko@arnaudov.name>
* *
************************************************************************** **************************************************************************
* This file contains interface to alsapid functionality * This file contains interface to alsapid functionality
@ -27,7 +27,7 @@
#ifndef ALSAPID_H__0A27F284_7538_4791_8023_0FBED929EAF3__INCLUDED #ifndef ALSAPID_H__0A27F284_7538_4791_8023_0FBED929EAF3__INCLUDED
#define ALSAPID_H__0A27F284_7538_4791_8023_0FBED929EAF3__INCLUDED #define ALSAPID_H__0A27F284_7538_4791_8023_0FBED929EAF3__INCLUDED
#include <stdbool.h> #include "../common.h"
void alsapid_compose_src_link(int alsa_client_id, char * buffer); void alsapid_compose_src_link(int alsa_client_id, char * buffer);
void alsapid_compose_dst_link(char * buffer); void alsapid_compose_dst_link(char * buffer);

7
alsapid/helper.c
View File

@ -2,7 +2,7 @@
/* /*
* LADI Session Handler (ladish) * LADI Session Handler (ladish)
* *
* Copyright (C) 2010 Nedko Arnaudov <nedko@arnaudov.name> * Copyright (C) 2010, 2011 Nedko Arnaudov <nedko@arnaudov.name>
* *
************************************************************************** **************************************************************************
* This file contains alsapid helper functionality * This file contains alsapid helper functionality
@ -24,7 +24,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#define _GNU_SOURCE #include "alsapid.h"
#include <string.h> /* GNU basename() */ #include <string.h> /* GNU basename() */
#include <stdio.h> #include <stdio.h>
@ -33,8 +34,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <linux/limits.h> #include <linux/limits.h>
#include "alsapid.h"
void alsapid_compose_src_link(int alsa_client_id, char * buffer) void alsapid_compose_src_link(int alsa_client_id, char * buffer)
{ {
sprintf(buffer, "/tmp/alsapid-%lld-%d", (long long)getuid(), alsa_client_id); sprintf(buffer, "/tmp/alsapid-%lld-%d", (long long)getuid(), alsa_client_id);

9
alsapid/lib.c
View File

@ -24,15 +24,13 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#define _GNU_SOURCE #include "alsapid.h"
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <linux/limits.h> #include <linux/limits.h>
#include <stdio.h> #include <stdio.h>
#include "alsapid.h"
#define API_VERSION "ALSA_0.9" #define API_VERSION "ALSA_0.9"
// gcc -g -shared -Wl,--version-script=asound.versions -o libasound.so -fPIC -ldl -Wall -Werror lib.c helper.c // gcc -g -shared -Wl,--version-script=asound.versions -o libasound.so -fPIC -ldl -Wall -Werror lib.c helper.c
@ -88,6 +86,7 @@ static int (* real_snd_seq_close)(snd_seq_t * handle);
} }
#if 0 #if 0
LADISH_PUBLIC
int snd_seq_open(snd_seq_t ** handle, const char * name, int streams, int mode) int snd_seq_open(snd_seq_t ** handle, const char * name, int streams, int mode)
{ {
int ret; int ret;
@ -106,6 +105,7 @@ int snd_seq_open(snd_seq_t ** handle, const char * name, int streams, int mode)
} }
#endif #endif
LADISH_PUBLIC
int snd_seq_set_client_name(snd_seq_t * seq, const char * name) int snd_seq_set_client_name(snd_seq_t * seq, const char * name)
{ {
int ret; int ret;
@ -127,6 +127,7 @@ int snd_seq_set_client_name(snd_seq_t * seq, const char * name)
return ret; return ret;
} }
LADISH_PUBLIC
int snd_seq_close(snd_seq_t * handle) int snd_seq_close(snd_seq_t * handle)
{ {
CHECK_FUNC(snd_seq_close); CHECK_FUNC(snd_seq_close);
@ -138,6 +139,7 @@ int snd_seq_close(snd_seq_t * handle)
} }
#if 0 #if 0
LADISH_PUBLIC
int snd_seq_create_port(snd_seq_t * handle, snd_seq_port_info_t * info) int snd_seq_create_port(snd_seq_t * handle, snd_seq_port_info_t * info)
{ {
int ret; int ret;
@ -151,6 +153,7 @@ int snd_seq_create_port(snd_seq_t * handle, snd_seq_port_info_t * info)
return ret; return ret;
} }
LADISH_PUBLIC
int snd_seq_create_simple_port(snd_seq_t * seq, const char * name, unsigned int caps, unsigned int type) int snd_seq_create_simple_port(snd_seq_t * seq, const char * name, unsigned int caps, unsigned int type)
{ {
int ret; int ret;

9
wscript
View File

@ -462,7 +462,14 @@ def build(bld):
##################################################### #####################################################
# alsapid # alsapid
bld.shlib(source = [os.path.join("alsapid", 'lib.c'), os.path.join("alsapid", "helper.c")], target = 'alsapid', uselib = 'DL') alsapid = bld.shlib(source = [], features = 'c cshlib', includes = [bld.path.get_bld()])
alsapid.uselib = 'DL'
alsapid.target = 'alsapid'
for source in [
'lib.c',
'helper.c',
]:
alsapid.source.append(os.path.join("alsapid", source))
##################################################### #####################################################
# liblash # liblash