mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	make rename of oss.[ch] to oss-util.[ch] complete
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@35 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
		
							parent
							
								
									c050d7254c
								
							
						
					
					
						commit
						a1b59db712
					
				
					 5 changed files with 11 additions and 11 deletions
				
			
		| 
						 | 
				
			
			@ -23,7 +23,7 @@ bin_PROGRAMS = polypaudio pacat
 | 
			
		|||
pkglib_LTLIBRARIES=libiochannel.la libsocket-server.la libsocket-client.la \
 | 
			
		||||
		libprotocol-simple.la module-simple-protocol-tcp.la \
 | 
			
		||||
		module-pipe-sink.la libpstream.la \
 | 
			
		||||
		libpacket.la module-oss.la module-oss-mmap.la liboss.la libioline.la \
 | 
			
		||||
		libpacket.la module-oss.la module-oss-mmap.la liboss-util.la libioline.la \
 | 
			
		||||
		libcli.la module-cli.la libtokenizer.la libdynarray.la \
 | 
			
		||||
		module-simple-protocol-unix.la module-cli-protocol-tcp.la \
 | 
			
		||||
		libprotocol-cli.la module-cli-protocol-unix.la libtagstruct.la \
 | 
			
		||||
| 
						 | 
				
			
			@ -86,8 +86,8 @@ libiochannel_la_LDFLAGS = -avoid-version
 | 
			
		|||
libpacket_la_SOURCES = packet.c packet.h
 | 
			
		||||
libpacket_la_LDFLAGS = -avoid-version
 | 
			
		||||
 | 
			
		||||
liboss_la_SOURCES = oss.c oss.h
 | 
			
		||||
liboss_la_LDFLAGS = -avoid-version
 | 
			
		||||
liboss_util_la_SOURCES = oss-util.c oss-util.h
 | 
			
		||||
liboss_util_la_LDFLAGS = -avoid-version
 | 
			
		||||
 | 
			
		||||
libioline_la_SOURCES = ioline.c ioline.h
 | 
			
		||||
libioline_la_LDFLAGS = -avoid-version
 | 
			
		||||
| 
						 | 
				
			
			@ -151,11 +151,11 @@ module_pipe_sink_la_LIBADD = libiochannel.la
 | 
			
		|||
 | 
			
		||||
module_oss_la_SOURCES = module-oss.c
 | 
			
		||||
module_oss_la_LDFLAGS = -module -avoid-version
 | 
			
		||||
module_oss_la_LIBADD = libiochannel.la liboss.la
 | 
			
		||||
module_oss_la_LIBADD = libiochannel.la liboss-util.la
 | 
			
		||||
 | 
			
		||||
module_oss_mmap_la_SOURCES = module-oss-mmap.c
 | 
			
		||||
module_oss_mmap_la_LDFLAGS = -module -avoid-version
 | 
			
		||||
module_oss_mmap_la_LIBADD = libiochannel.la liboss.la
 | 
			
		||||
module_oss_mmap_la_LIBADD = libiochannel.la liboss-util.la
 | 
			
		||||
 | 
			
		||||
module_cli_la_SOURCES = module-cli.c
 | 
			
		||||
module_cli_la_LDFLAGS = -module -avoid-version
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,7 +15,7 @@
 | 
			
		|||
#include "sink.h"
 | 
			
		||||
#include "source.h"
 | 
			
		||||
#include "module.h"
 | 
			
		||||
#include "oss.h"
 | 
			
		||||
#include "oss-util.h"
 | 
			
		||||
#include "sample-util.h"
 | 
			
		||||
 | 
			
		||||
struct userdata {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,7 +14,7 @@
 | 
			
		|||
#include "sink.h"
 | 
			
		||||
#include "source.h"
 | 
			
		||||
#include "module.h"
 | 
			
		||||
#include "oss.h"
 | 
			
		||||
#include "oss-util.h"
 | 
			
		||||
#include "sample-util.h"
 | 
			
		||||
 | 
			
		||||
struct userdata {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,7 +5,7 @@
 | 
			
		|||
#include <errno.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
 | 
			
		||||
#include "oss.h"
 | 
			
		||||
#include "oss-util.h"
 | 
			
		||||
 | 
			
		||||
int oss_auto_format(int fd, struct pa_sample_spec *ss) {
 | 
			
		||||
    int format, channels, speed;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
#ifndef fooosshfoo
 | 
			
		||||
#define fooosshfoo
 | 
			
		||||
#ifndef fooossutilhfoo
 | 
			
		||||
#define fooossutilhfoo
 | 
			
		||||
 | 
			
		||||
#include "sample.h"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue