Skip to content

Commit

Permalink
#849: remove unused bits
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@9527 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed May 27, 2015
1 parent fa765de commit 7a3c4a7
Showing 1 changed file with 2 additions and 18 deletions.
20 changes: 2 additions & 18 deletions src/xpra/sound/src.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,12 @@
from xpra.os_util import SIGNAMES
from xpra.sound.sound_pipeline import SoundPipeline, gobject
from xpra.gtk_common.gobject_util import n_arg_signal
from xpra.sound.gstreamer_util import plugin_str, get_encoder_formatter, get_source_plugins, get_queue_time, normv, \
MP3, CODECS, CODEC_ORDER, QUEUE_LEAK, ENCODER_DEFAULT_OPTIONS, ENCODER_NEEDS_AUDIOCONVERT, MS_TO_NS
from xpra.sound.gstreamer_util import plugin_str, get_encoder_formatter, get_source_plugins, normv, \
MP3, CODECS, CODEC_ORDER, ENCODER_DEFAULT_OPTIONS, ENCODER_NEEDS_AUDIOCONVERT, MS_TO_NS
from xpra.log import Logger
log = Logger("sound")


AUDIORESAMPLE = False
QUEUE_TIME = get_queue_time(0)


class SoundSource(SoundPipeline):

__gsignals__ = SoundPipeline.__generic_signals__.copy()
Expand Down Expand Up @@ -57,19 +53,7 @@ def __init__(self, src_type=None, src_options={}, codecs=CODECS, codec_options={
pipeline_els = [source_str]
if encoder in ENCODER_NEEDS_AUDIOCONVERT:
pipeline_els += ["audioconvert"]
if AUDIORESAMPLE:
pipeline_els += [
"audioresample",
"audio/x-raw-int,rate=44100,channels=2"]
pipeline_els.append("volume name=volume volume=%s" % volume)
if QUEUE_TIME>0:
queue_el = ["queue",
"name=queue",
"max-size-buffers=0",
"max-size-bytes=0",
"max-size-time=%s" % QUEUE_TIME,
"leaky=%s" % QUEUE_LEAK]
pipeline_els.append(" ".join(queue_el))
pipeline_els += [encoder_str,
fmt,
"appsink name=sink"]
Expand Down

0 comments on commit 7a3c4a7

Please sign in to comment.