From 74338ecf5ef2b416f09cf6ff80479a3acb9639b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 13 Jan 2015 14:28:05 -0500
Subject: [PATCH] rebranding: use PACKAGE_NAME for PA streams
Refs #63289
Change-Id: Ibc993ac83180e52c64264201cb12875468fe07c3
---
daemon/configure.ac | 4 ++--
daemon/src/audio/codecs/README | 2 +-
daemon/src/audio/pulseaudio/pulselayer.cpp | 10 +++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/daemon/configure.ac b/daemon/configure.ac
index 55fd1351d3..c53f29b533 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -1,8 +1,8 @@
-dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
+dnl Ring - configure.ac for automake 1.9 and autoconf 2.59
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.65])
-AC_INIT([ring],[2.0.0],[sflphoneteam@savoirfairelinux.com],[ring])
+AC_INIT([Ring],[2.0.0],[sflphoneteam@savoirfairelinux.com],[ring])
AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014]])
AC_REVISION([$Revision$])
diff --git a/daemon/src/audio/codecs/README b/daemon/src/audio/codecs/README
index f7fbdf1a88..0a82f9aab2 100644
--- a/daemon/src/audio/codecs/README
+++ b/daemon/src/audio/codecs/README
@@ -21,4 +21,4 @@ CODEC_GSM:
REFERENCES: http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html
-The shared library should be installed in $(libdir)/sflphone/codecs where libdir=$(PREFIX)/lib.
+The shared library should be installed in $(libdir)/ring/codecs where libdir=$(PREFIX)/lib.
diff --git a/daemon/src/audio/pulseaudio/pulselayer.cpp b/daemon/src/audio/pulseaudio/pulselayer.cpp
index 4462719a6f..25709ad15a 100644
--- a/daemon/src/audio/pulseaudio/pulselayer.cpp
+++ b/daemon/src/audio/pulseaudio/pulselayer.cpp
@@ -119,14 +119,14 @@ PulseLayer::PulseLayer(AudioPreference &pref)
pa_proplist *pl = pa_proplist_new();
pa_proplist_sets(pl, PA_PROP_MEDIA_ROLE, "phone");
- context_ = pa_context_new_with_proplist(pa_threaded_mainloop_get_api(mainloop_), "SFLphone", pl);
+ context_ = pa_context_new_with_proplist(pa_threaded_mainloop_get_api(mainloop_), PACKAGE_NAME, pl);
if (pl)
pa_proplist_free(pl);
#else
setenv("PULSE_PROP_media.role", "phone", 1);
- context_ = pa_context_new(pa_threaded_mainloop_get_api(mainloop_), "SFLphone");
+ context_ = pa_context_new(pa_threaded_mainloop_get_api(mainloop_), PACKAGE_NAME);
#endif
if (!context_) {
@@ -375,7 +375,7 @@ void PulseLayer::createStreams(pa_context* c)
playbackDevice.c_str(), dev_infos->name.c_str());
}
- playback_ = new AudioStream(c, mainloop_, "SFLphone playback", PLAYBACK_STREAM, audioFormat_.sample_rate, dev_infos);
+ playback_ = new AudioStream(c, mainloop_, "Playback", PLAYBACK_STREAM, audioFormat_.sample_rate, dev_infos);
pa_stream_set_write_callback(playback_->pulseStream(), playback_callback, this);
pa_stream_set_moved_callback(playback_->pulseStream(), stream_moved_callback, this);
@@ -389,7 +389,7 @@ void PulseLayer::createStreams(pa_context* c)
captureDevice.c_str(), dev_infos->name.c_str());
}
- record_ = new AudioStream(c, mainloop_, "SFLphone capture", CAPTURE_STREAM, audioFormat_.sample_rate, dev_infos);
+ record_ = new AudioStream(c, mainloop_, "Capture", CAPTURE_STREAM, audioFormat_.sample_rate, dev_infos);
pa_stream_set_read_callback(record_->pulseStream() , capture_callback, this);
pa_stream_set_moved_callback(record_->pulseStream(), stream_moved_callback, this);
@@ -403,7 +403,7 @@ void PulseLayer::createStreams(pa_context* c)
ringtoneDevice.c_str(), dev_infos->name.c_str());
}
- ringtone_ = new AudioStream(c, mainloop_, "SFLphone ringtone", RINGTONE_STREAM, audioFormat_.sample_rate, dev_infos);
+ ringtone_ = new AudioStream(c, mainloop_, "Ringtone", RINGTONE_STREAM, audioFormat_.sample_rate, dev_infos);
pa_stream_set_write_callback(ringtone_->pulseStream(), ringtone_callback, this);
pa_stream_set_moved_callback(ringtone_->pulseStream(), stream_moved_callback, this);
--
GitLab