From 045c1d602dcba57868845ba3270510593c39480f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 15 May 2008 23:34:41 +0000
Subject: merge glitch-free branch back into trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2445 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/map-file | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'src/map-file')

diff --git a/src/map-file b/src/map-file
index ffa5d103..d9189743 100644
--- a/src/map-file
+++ b/src/map-file
@@ -30,6 +30,7 @@ pa_context_get_autoload_info_by_name;
 pa_context_get_autoload_info_list;
 pa_context_get_client_info;
 pa_context_get_client_info_list;
+pa_context_get_index;
 pa_context_get_module_info;
 pa_context_get_module_info_list;
 pa_context_get_protocol_version;
@@ -61,7 +62,11 @@ pa_context_move_sink_input_by_name;
 pa_context_move_source_output_by_index;
 pa_context_move_source_output_by_name;
 pa_context_new;
+pa_context_new_with_proplist;
 pa_context_play_sample;
+pa_context_play_sample_with_proplist;
+pa_context_proplist_remove;
+pa_context_proplist_update;
 pa_context_ref;
 pa_context_remove_autoload_by_index;
 pa_context_remove_autoload_by_name;
@@ -128,14 +133,19 @@ pa_operation_unref;
 pa_parse_sample_format;
 pa_path_get_filename;
 pa_proplist_free;
+pa_proplist_contains;
+pa_proplist_clear;
+pa_proplist_copy;
 pa_proplist_get;
 pa_proplist_gets;
 pa_proplist_iterate;
-pa_proplist_merge;
+pa_proplist_update;
 pa_proplist_new;
-pa_proplist_put;
-pa_proplist_puts;
-pa_proplist_remove;
+pa_proplist_set;
+pa_proplist_sets;
+pa_proplist_setf;
+pa_proplist_unset;
+pa_proplist_unset_many;
 pa_proplist_to_string;
 pa_sample_format_to_string;
 pa_sample_size;
@@ -174,10 +184,14 @@ pa_stream_get_sample_spec;
 pa_stream_get_state;
 pa_stream_get_time;
 pa_stream_get_timing_info;
+pa_stream_is_corked;
 pa_stream_is_suspended;
 pa_stream_new;
+pa_stream_new_with_proplist;
 pa_stream_peek;
 pa_stream_prebuf;
+pa_stream_proplist_remove;
+pa_stream_proplist_update;
 pa_stream_readable_size;
 pa_stream_ref;
 pa_stream_set_buffer_attr;
@@ -186,6 +200,7 @@ pa_stream_set_moved_callback;
 pa_stream_set_name;
 pa_stream_set_overflow_callback;
 pa_stream_set_read_callback;
+pa_stream_set_started_callback;
 pa_stream_set_state_callback;
 pa_stream_set_suspended_callback;
 pa_stream_set_underflow_callback;
@@ -221,6 +236,7 @@ pa_timeval_cmp;
 pa_timeval_diff;
 pa_timeval_load;
 pa_timeval_store;
+pa_timeval_sub;
 pa_usec_to_bytes;
 pa_utf8_filter;
 pa_utf8_to_locale;
-- 
cgit