From 631b0d90f87c089f9202f39292110dde3e5f1d49 Mon Sep 17 00:00:00 2001 From: Sudarsana Nagineni Date: Mon, 22 Sep 2014 15:28:45 +0300 Subject: [PATCH] Revert "[TIZEN] Tag the audio stream as "browser" in pulseaudio." These changes are not needed anymore since the Murphy integration is in place and we are setting media role for streams while creating Murphy resource. This reverts commit 731fb7f83c8535399647e8a9630ea842ecbd4321. --- media/audio/pulse/pulse.sigs | 5 ----- media/audio/pulse/pulse_util.cc | 9 --------- 2 files changed, 14 deletions(-) diff --git a/media/audio/pulse/pulse.sigs b/media/audio/pulse/pulse.sigs index 45718b9682bef..8d2dab70c605c 100644 --- a/media/audio/pulse/pulse.sigs +++ b/media/audio/pulse/pulse.sigs @@ -50,8 +50,3 @@ void pa_stream_unref(pa_stream* s); int pa_context_errno(pa_context *c); const char* pa_strerror(int error); pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned channels, pa_volume_t v); -# Functions from pulse used in TIZEN to tag the audio stream as "browser". -pa_proplist* pa_proplist_new(void); -void pa_proplist_free(pa_proplist* p); -int pa_proplist_sets(pa_proplist *p, const char *key, const char *value); -pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* proplist); diff --git a/media/audio/pulse/pulse_util.cc b/media/audio/pulse/pulse_util.cc index 357352a55137e..c06195eb19825 100644 --- a/media/audio/pulse/pulse_util.cc +++ b/media/audio/pulse/pulse_util.cc @@ -259,16 +259,7 @@ bool CreateOutputStream(pa_threaded_mainloop** mainloop, // than the default channel map (NULL). map = &source_channel_map; } -#if defined(OS_TIZEN) - pa_proplist* proplist = pa_proplist_new(); - pa_proplist_sets(proplist, PA_PROP_MEDIA_ROLE, "browser"); - *stream = pa_stream_new_with_proplist(*context, "Playback", - &sample_specifications, - map, proplist); - pa_proplist_free(proplist); -#else *stream = pa_stream_new(*context, "Playback", &sample_specifications, map); -#endif RETURN_ON_FAILURE(*stream, "failed to create PA playback stream"); pa_stream_set_state_callback(*stream, stream_callback, user_data);