From 992ec05aaf71577c5ebd014885e97789cc2bd3d9 Mon Sep 17 00:00:00 2001 From: "David I. Lehn" Date: Thu, 3 Oct 2002 22:11:37 +0000 Subject: [PATCH] use "python" vs "python2.2" update for newer bindings and api Original commit message from CVS: use "python" vs "python2.2" update for newer bindings and api --- common | 2 +- examples/gst/cp.py | 8 ++++---- examples/gst/dvdplay.py | 8 ++++---- examples/gst/f2f.py | 8 ++++---- examples/gst/identity.py | 8 ++++---- examples/gst/ilat.py | 8 ++++---- examples/gst/lat.py | 10 +++++----- examples/gst/oggplay.py | 4 ++-- examples/gst/rot13.py | 2 +- examples/gstreamer/cp.py | 8 ++++---- examples/gstreamer/dvdplay.py | 8 ++++---- examples/gstreamer/f2f.py | 8 ++++---- examples/gstreamer/identity.py | 8 ++++---- examples/gstreamer/ilat.py | 8 ++++---- examples/gstreamer/lat.py | 10 +++++----- examples/gstreamer/oggplay.py | 4 ++-- examples/gstreamer/rot13.py | 2 +- 17 files changed, 57 insertions(+), 57 deletions(-) diff --git a/common b/common index 4dab76096c..fa2e4df50f 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 4dab76096cb84988dc2b6366cf5bd964fe5857d7 +Subproject commit fa2e4df50fd965b1dbd3b35b87d914ff87362815 diff --git a/examples/gst/cp.py b/examples/gst/cp.py index a3e6cc849d..0d474f7537 100755 --- a/examples/gst/cp.py +++ b/examples/gst/cp.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn @@ -36,15 +36,15 @@ def filter(filters): return -1 # create a new bin to hold the elements - bin = gst_pipeline_new ('pipeline') + bin = Pipeline('pipeline') - filesrc = gst_element_factory_make ('filesrc', 'source'); + filesrc = gst_element_factory_make('filesrc', 'source'); if not filesrc: print 'could not find plugin \"filesrc\"' return -1 filesrc.set_property('location', sys.argv[1]) - filesink = gst_element_factory_make ('filesink', 'sink') + filesink = gst_element_factory_make('filesink', 'sink') if not filesink: print 'could not find plugin \"filesink\"' return -1 diff --git a/examples/gst/dvdplay.py b/examples/gst/dvdplay.py index dfec9d47f9..b38af3ce1f 100755 --- a/examples/gst/dvdplay.py +++ b/examples/gst/dvdplay.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn @@ -96,7 +96,7 @@ class DVDPlayer(object): def build_video_thread(self): # ***** pre-construct the video thread ***** - self.v_thread = gst_thread_new('v_thread') + self.v_thread = Thread('v_thread') assert self.v_thread self.v_queue = gst_element_factory_make('queue','v_queue') @@ -148,7 +148,7 @@ class DVDPlayer(object): def build_audio_thread(self): # ***** pre-construct the audio thread ***** - self.a_thread = gst_thread_new('a_thread') + self.a_thread = Thread('a_thread') assert self.a_thread self.a_queue = gst_element_factory_make('queue','a_queue') @@ -171,7 +171,7 @@ class DVDPlayer(object): def build(self): # ***** construct the main pipeline ***** - self.pipeline = gst_pipeline_new('pipeline') + self.pipeline = Pipeline('pipeline') assert self.pipeline self.src = gst_element_factory_make('dvdreadsrc','src'); diff --git a/examples/gst/f2f.py b/examples/gst/f2f.py index 98370c1063..08f80a1034 100755 --- a/examples/gst/f2f.py +++ b/examples/gst/f2f.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn @@ -30,16 +30,16 @@ def handoff(sender, *args): def main(): # create a new bin to hold the elements #gst_debug_set_categories(-1) - bin = gst_pipeline_new ('pipeline') + bin = Pipeline('pipeline') assert bin - src = gst_element_factory_make ('fakesrc', 'src') + src = gst_element_factory_make('fakesrc', 'src') assert src GObject.connect(src, 'handoff', handoff) src.set_property('silent', 1) src.set_property('num_buffers', 10) - sink = gst_element_factory_make ('fakesink', 'sink') + sink = gst_element_factory_make('fakesink', 'sink') assert sink GObject.connect(sink, 'handoff', handoff) src.set_property('silent', 1) diff --git a/examples/gst/identity.py b/examples/gst/identity.py index a76477a5c2..00f1184e6a 100755 --- a/examples/gst/identity.py +++ b/examples/gst/identity.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn @@ -29,12 +29,12 @@ from cp import filter class Identity(Element): def __init__(self): self.__gobject_init__() - self.sinkpad = gst_pad_new('sink', PAD_SINK) + self.sinkpad = Pad('sink', PAD_SINK) self.add_pad(self.sinkpad) self.sinkpad.set_chain_function(self.chain) self.sinkpad.set_connect_function(self.pad_connect) - self.srcpad = gst_pad_new('src', PAD_SRC) + self.srcpad = Pad('src', PAD_SRC) self.add_pad(self.srcpad) self.srcpad.set_connect_function(self.pad_connect) @@ -53,7 +53,7 @@ gobject.type_register(Identity) def main(): "A GStreamer Python subclassing example of an identity filter" - gst_debug_set_categories(0) + gst_debug_set_categories(0L) identity = Identity() identity.set_name('identity') diff --git a/examples/gst/ilat.py b/examples/gst/ilat.py index 0db8dc2df1..664d3911d0 100755 --- a/examples/gst/ilat.py +++ b/examples/gst/ilat.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn @@ -32,14 +32,14 @@ def update(sender, *args): def build(filters, b): # create a new bin to hold the elements - bin = gst_pipeline_new ('pipeline') + bin = Pipeline('pipeline') - src = gst_element_factory_make ('fakesrc', 'source'); + src = gst_element_factory_make('fakesrc', 'source'); assert src src.set_property('silent', 1) src.set_property('num_buffers', b) - sink = gst_element_factory_make ('fakesink', 'sink') + sink = gst_element_factory_make('fakesink', 'sink') assert sink sink.set_property('silent', 1) diff --git a/examples/gst/lat.py b/examples/gst/lat.py index d24c6142dc..360bddc418 100755 --- a/examples/gst/lat.py +++ b/examples/gst/lat.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn @@ -95,7 +95,7 @@ def simple(argv): if len(argv) == 2: gst_schedulerfactory_set_default_name (argv[1]) - pipeline = gst_pipeline_new('pipeline') + pipeline = Pipeline('pipeline') assert pipeline src = fakesrc() @@ -116,10 +116,10 @@ def queue(argv): if len(arv) == 2: gst_schedulerfactory_set_default_name (argv[1]) - pipeline = gst_pipeline_new('pipeline') + pipeline = Pipeline('pipeline') assert pipeline - src_thr = gst_thread_new('src_thread') + src_thr = Thread('src_thread') assert src_thr src = fakesrc() @@ -140,7 +140,7 @@ def queue(argv): pipeline.add(sink_q) last.get_pad('src').connect(sink_q.get_pad('sink')) - sink_thr = gst_thread_new('sink_thread') + sink_thr = Thread('sink_thread') assert sink_thr sink = fakesink() diff --git a/examples/gst/oggplay.py b/examples/gst/oggplay.py index 68344d8735..2ce0b66425 100755 --- a/examples/gst/oggplay.py +++ b/examples/gst/oggplay.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn @@ -33,7 +33,7 @@ def main(): return -1 # create a new bin to hold the elements - bin = gst_pipeline_new ('pipeline') + bin = Pipeline('pipeline') # create a disk reader filesrc = gst_element_factory_make ('filesrc', 'disk_source'); diff --git a/examples/gst/rot13.py b/examples/gst/rot13.py index c0cdfd733e..92eb67537c 100755 --- a/examples/gst/rot13.py +++ b/examples/gst/rot13.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn diff --git a/examples/gstreamer/cp.py b/examples/gstreamer/cp.py index a3e6cc849d..0d474f7537 100755 --- a/examples/gstreamer/cp.py +++ b/examples/gstreamer/cp.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn @@ -36,15 +36,15 @@ def filter(filters): return -1 # create a new bin to hold the elements - bin = gst_pipeline_new ('pipeline') + bin = Pipeline('pipeline') - filesrc = gst_element_factory_make ('filesrc', 'source'); + filesrc = gst_element_factory_make('filesrc', 'source'); if not filesrc: print 'could not find plugin \"filesrc\"' return -1 filesrc.set_property('location', sys.argv[1]) - filesink = gst_element_factory_make ('filesink', 'sink') + filesink = gst_element_factory_make('filesink', 'sink') if not filesink: print 'could not find plugin \"filesink\"' return -1 diff --git a/examples/gstreamer/dvdplay.py b/examples/gstreamer/dvdplay.py index dfec9d47f9..b38af3ce1f 100755 --- a/examples/gstreamer/dvdplay.py +++ b/examples/gstreamer/dvdplay.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn @@ -96,7 +96,7 @@ class DVDPlayer(object): def build_video_thread(self): # ***** pre-construct the video thread ***** - self.v_thread = gst_thread_new('v_thread') + self.v_thread = Thread('v_thread') assert self.v_thread self.v_queue = gst_element_factory_make('queue','v_queue') @@ -148,7 +148,7 @@ class DVDPlayer(object): def build_audio_thread(self): # ***** pre-construct the audio thread ***** - self.a_thread = gst_thread_new('a_thread') + self.a_thread = Thread('a_thread') assert self.a_thread self.a_queue = gst_element_factory_make('queue','a_queue') @@ -171,7 +171,7 @@ class DVDPlayer(object): def build(self): # ***** construct the main pipeline ***** - self.pipeline = gst_pipeline_new('pipeline') + self.pipeline = Pipeline('pipeline') assert self.pipeline self.src = gst_element_factory_make('dvdreadsrc','src'); diff --git a/examples/gstreamer/f2f.py b/examples/gstreamer/f2f.py index 98370c1063..08f80a1034 100755 --- a/examples/gstreamer/f2f.py +++ b/examples/gstreamer/f2f.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn @@ -30,16 +30,16 @@ def handoff(sender, *args): def main(): # create a new bin to hold the elements #gst_debug_set_categories(-1) - bin = gst_pipeline_new ('pipeline') + bin = Pipeline('pipeline') assert bin - src = gst_element_factory_make ('fakesrc', 'src') + src = gst_element_factory_make('fakesrc', 'src') assert src GObject.connect(src, 'handoff', handoff) src.set_property('silent', 1) src.set_property('num_buffers', 10) - sink = gst_element_factory_make ('fakesink', 'sink') + sink = gst_element_factory_make('fakesink', 'sink') assert sink GObject.connect(sink, 'handoff', handoff) src.set_property('silent', 1) diff --git a/examples/gstreamer/identity.py b/examples/gstreamer/identity.py index a76477a5c2..00f1184e6a 100755 --- a/examples/gstreamer/identity.py +++ b/examples/gstreamer/identity.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn @@ -29,12 +29,12 @@ from cp import filter class Identity(Element): def __init__(self): self.__gobject_init__() - self.sinkpad = gst_pad_new('sink', PAD_SINK) + self.sinkpad = Pad('sink', PAD_SINK) self.add_pad(self.sinkpad) self.sinkpad.set_chain_function(self.chain) self.sinkpad.set_connect_function(self.pad_connect) - self.srcpad = gst_pad_new('src', PAD_SRC) + self.srcpad = Pad('src', PAD_SRC) self.add_pad(self.srcpad) self.srcpad.set_connect_function(self.pad_connect) @@ -53,7 +53,7 @@ gobject.type_register(Identity) def main(): "A GStreamer Python subclassing example of an identity filter" - gst_debug_set_categories(0) + gst_debug_set_categories(0L) identity = Identity() identity.set_name('identity') diff --git a/examples/gstreamer/ilat.py b/examples/gstreamer/ilat.py index 0db8dc2df1..664d3911d0 100755 --- a/examples/gstreamer/ilat.py +++ b/examples/gstreamer/ilat.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn @@ -32,14 +32,14 @@ def update(sender, *args): def build(filters, b): # create a new bin to hold the elements - bin = gst_pipeline_new ('pipeline') + bin = Pipeline('pipeline') - src = gst_element_factory_make ('fakesrc', 'source'); + src = gst_element_factory_make('fakesrc', 'source'); assert src src.set_property('silent', 1) src.set_property('num_buffers', b) - sink = gst_element_factory_make ('fakesink', 'sink') + sink = gst_element_factory_make('fakesink', 'sink') assert sink sink.set_property('silent', 1) diff --git a/examples/gstreamer/lat.py b/examples/gstreamer/lat.py index d24c6142dc..360bddc418 100755 --- a/examples/gstreamer/lat.py +++ b/examples/gstreamer/lat.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn @@ -95,7 +95,7 @@ def simple(argv): if len(argv) == 2: gst_schedulerfactory_set_default_name (argv[1]) - pipeline = gst_pipeline_new('pipeline') + pipeline = Pipeline('pipeline') assert pipeline src = fakesrc() @@ -116,10 +116,10 @@ def queue(argv): if len(arv) == 2: gst_schedulerfactory_set_default_name (argv[1]) - pipeline = gst_pipeline_new('pipeline') + pipeline = Pipeline('pipeline') assert pipeline - src_thr = gst_thread_new('src_thread') + src_thr = Thread('src_thread') assert src_thr src = fakesrc() @@ -140,7 +140,7 @@ def queue(argv): pipeline.add(sink_q) last.get_pad('src').connect(sink_q.get_pad('sink')) - sink_thr = gst_thread_new('sink_thread') + sink_thr = Thread('sink_thread') assert sink_thr sink = fakesink() diff --git a/examples/gstreamer/oggplay.py b/examples/gstreamer/oggplay.py index 68344d8735..2ce0b66425 100755 --- a/examples/gstreamer/oggplay.py +++ b/examples/gstreamer/oggplay.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn @@ -33,7 +33,7 @@ def main(): return -1 # create a new bin to hold the elements - bin = gst_pipeline_new ('pipeline') + bin = Pipeline('pipeline') # create a disk reader filesrc = gst_element_factory_make ('filesrc', 'disk_source'); diff --git a/examples/gstreamer/rot13.py b/examples/gstreamer/rot13.py index c0cdfd733e..92eb67537c 100755 --- a/examples/gstreamer/rot13.py +++ b/examples/gstreamer/rot13.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.2 +#!/usr/bin/env python # # gst-python # Copyright (C) 2002 David I. Lehn