diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-11-08 08:17:56 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-11-08 08:22:52 +0800 |
| commit | 64a173ce325b9ba30079ce5b9f3bbe1615302ecb (patch) | |
| tree | de432548011f686eb145bb0b4f9db217d4f0ddb4 /data | |
| parent | 945df143a94c9c64c925591e09e6dd28c43408ff (diff) | |
| download | gsoc2013-empathy-64a173ce325b9ba30079ce5b9f3bbe1615302ecb.tar gsoc2013-empathy-64a173ce325b9ba30079ce5b9f3bbe1615302ecb.tar.gz gsoc2013-empathy-64a173ce325b9ba30079ce5b9f3bbe1615302ecb.tar.bz2 gsoc2013-empathy-64a173ce325b9ba30079ce5b9f3bbe1615302ecb.tar.lz gsoc2013-empathy-64a173ce325b9ba30079ce5b9f3bbe1615302ecb.tar.xz gsoc2013-empathy-64a173ce325b9ba30079ce5b9f3bbe1615302ecb.tar.zst gsoc2013-empathy-64a173ce325b9ba30079ce5b9f3bbe1615302ecb.zip | |
Remove dead files codec-preferences and element-preferences
These are now handled for us by Farsight. Hooray for Farsight.
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 6 | ||||
| -rw-r--r-- | data/codec-preferences | 50 | ||||
| -rw-r--r-- | data/element-properties | 59 |
3 files changed, 0 insertions, 115 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index e6414a805..a08ed620d 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -19,11 +19,6 @@ convertdir = $(datarootdir)/GConf/gsettings convert_DATA = \ empathy.convert -streamingprefsdir = $(datadir)/empathy -streamingprefs_DATA = \ - codec-preferences \ - element-properties - servicefiledir = $(datadir)/dbus-1/services servicefile_in_files = \ org.freedesktop.Telepathy.Client.Empathy.Chat.service.in \ @@ -76,7 +71,6 @@ EXTRA_DIST = \ $(desktop_in_files) \ $(desktop_DATA) \ $(schemas_DATA) \ - $(streamingprefs_DATA) \ $(html_DATA) \ $(clientfile_DATA) \ $(servicefile_in_files) \ diff --git a/data/codec-preferences b/data/codec-preferences deleted file mode 100644 index fbd8ad55d..000000000 --- a/data/codec-preferences +++ /dev/null @@ -1,50 +0,0 @@ -# Favorite audio codecs - -[audio/SPEEX:8000] -clock-rate=8000 - -[audio/SPEEX:16000] -clock-rate=16000 - -[audio/AMR] - -[audio/G729] - -[audio/ILBC] - -# Disabled audio codecs - -[audio/DV] -id=-1 - -[audio/MPA] -id=-1 - -[audio/VORBIS] -id=-1 - -[audio/MP3] -id=-1 - - -# Favorite video codecs - -# We like freedom and the future (proof of concept VP8 payloading) -[video/X-VP8-GST] - -# but keep an eye on people living in the past -[video/H264] - -[video/H263] - -[video/THEORA] - -# Disable the ones we don't want -[video/JPEG] -id=-1 - -[video/DV] -id=-1 - -[video/MPV] -id=-1 diff --git a/data/element-properties b/data/element-properties deleted file mode 100644 index 68debc234..000000000 --- a/data/element-properties +++ /dev/null @@ -1,59 +0,0 @@ -# Put the desired properties in the style of -# -# [element name] -# prop1=val1 - -[gstrtpbin] -latency=100 - -[x264enc] -byte-stream=1 -bframes=0 -b-adapt=0 -cabac=0 -dct8x8=0 -bitrate=256 -# tuned for zero latency -tune=0x4 -profile=1 -speed-preset=3 -sliced-threads=false -aud=false - -[ffenc_h263] -rtp-payload-size=1 - -[theoraenc] -bitrate=256 - -[vp8enc] -bitrate=256000 -max-latency=1 -speed=2 -error-resilient=true - -# Work around bug in the re-timestamp slaving method in -# GStreamer (2 is skew) -[alsasrc] -slave-method=2 - -[osssrc] -slave-method=2 - -[oss4src] -slave-method=2 - -[sunaudiosrc] -slave-method=2 - -[rtph264pay] -config-interval=5 - -[rtppcmupay] -ptime-multiple=20000000 - -[rtppcmapay] -ptime-multiple=20000000 - -[gstrtpjitterbuffer] -do-lost=1 |