Commit 1fcd395e authored by Edward Hervey's avatar Edward Hervey

* bin/pitivi.in:

* configure.ac:
Preparation for oh ten oh
Update dependency on (py)gtk to 2.8.0
* pitivi/bin.py:
* pitivi/discoverer.py:
* pitivi/objectfactory.py:
* pitivi/pitivi.py:
* pitivi/playground.py:
* pitivi/project.py:
* pitivi/settings.py:
* pitivi/sourcelist.py:
* pitivi/timeline.py:
* pitivi/ui/exportsettingswidget.py:
* pitivi/ui/glade.py:
* pitivi/ui/gstwidget.py:
* pitivi/ui/mainwindow.py:
* pitivi/ui/sourcefactories.py:
* pitivi/ui/timeline.py:
* pitivi/ui/timelineobjects.py:
* pitivi/ui/viewer.py:
Remove pygtk 2.8 deprecated object registration


git-svn-id: svn+ssh://svn.gnome.org/svn/pitivi/trunk@667 d3729300-e425-0410-8a4c-d956edccc248
parent 068fc113
2005-12-02 Edward Hervey <edward@fluendo.com>
* bin/pitivi.in:
* configure.ac:
Preparation for oh ten oh
Update dependency on (py)gtk to 2.8.0
* pitivi/bin.py:
* pitivi/discoverer.py:
* pitivi/objectfactory.py:
* pitivi/pitivi.py:
* pitivi/playground.py:
* pitivi/project.py:
* pitivi/settings.py:
* pitivi/sourcelist.py:
* pitivi/timeline.py:
* pitivi/ui/exportsettingswidget.py:
* pitivi/ui/glade.py:
* pitivi/ui/gstwidget.py:
* pitivi/ui/mainwindow.py:
* pitivi/ui/sourcefactories.py:
* pitivi/ui/timeline.py:
* pitivi/ui/timelineobjects.py:
* pitivi/ui/viewer.py:
Remove pygtk 2.8 deprecated object registration
2005-12-01 Edward Hervey <edward@fluendo.com>
Misc updates for new gnonlin start/duration scheme
......
......@@ -56,7 +56,7 @@ def _init_gobject_gtk_gst():
try:
import pygst
pygst.require('0.9')
pygst.require('0.10')
import gst
except ImportError:
......
......@@ -6,7 +6,7 @@ AC_SUBST(RELEASE, $PITIVI_RELEASE)
AC_SUBST_FILE(AUTHORS)
AUTHORS=$srcdir/AUTHORS
AC_SUBST(PYGTK_REQ, 2.6.0)
AC_SUBST(PYGTK_REQ, 2.8.0)
AC_SUBST(PYGST_REQ, 0.9.0)
AC_SUBST(PYGNOME_REQ, 2.10.0)
AC_SUBST(GST_REQ, 0.9.0)
......@@ -39,7 +39,7 @@ AS_AC_EXPAND(PYTHONDIR, $pythondir)
AC_MSG_NOTICE(Using pythondir $PYTHONDIR)
dnl check for GStreamer
PKG_CHECK_MODULES(GST, gstreamer-0.9 >= $GST_REQ)
PKG_CHECK_MODULES(GST, gstreamer-0.10 >= $GST_REQ)
dnl check for GNonlin
dnl PKG_CHECK_MODULES(GNONLIN, gnonlin >= $GNONLIN_REQ)
......
......@@ -125,7 +125,6 @@ class SmartBin(gst.Pipeline):
self.vsinkthread = None
return True
gobject.type_register(SmartBin)
class SmartFileBin(SmartBin):
"""
......@@ -171,7 +170,6 @@ class SmartFileBin(SmartBin):
self.info("destroyed")
self.factory.bin_is_destroyed(self.source)
gobject.type_register(SmartFileBin)
class SmartTimelineBin(SmartBin):
"""
......@@ -320,7 +318,6 @@ class SmartTimelineBin(SmartBin):
self.info("smart timeline bin: start duration changed %d %d" %( start, duration ))
self.length = duration
gobject.type_register(SmartTimelineBin)
class SmartDefaultBin(SmartBin):
"""
......@@ -349,4 +346,3 @@ class SmartDefaultBin(SmartBin):
self.silence.get_pad("src").link(self.atee.get_pad("sink"))
self.debug("finished connecting sources")
gobject.type_register(SmartDefaultBin)
......@@ -266,5 +266,3 @@ class Discoverer(gobject.GObject):
if not self.currentfactory or not self.currentfactory.is_audio or not self.currentfactory.is_video:
gst.warning("couldn't find a usable pad")
gobject.idle_add(self._finish_analysis)
gobject.type_register(Discoverer)
......@@ -101,7 +101,6 @@ class ObjectFactory(gobject.GObject):
""" returns a video only bin """
pass
gobject.type_register(ObjectFactory)
class FileSourceFactory(ObjectFactory):
"""
......@@ -427,7 +426,6 @@ class FileSourceFactory(ObjectFactory):
(bin, ascale, ident))
return bin
gobject.type_register(FileSourceFactory)
class OperationFactory(ObjectFactory):
"""
......@@ -439,7 +437,6 @@ class OperationFactory(ObjectFactory):
self.nbinput = 1
self.nboutput = 1
gobject.type_register(OperationFactory)
class SimpleOperationFactory(OperationFactory):
"""
......@@ -484,7 +481,6 @@ class TransitionFactory(OperationFactory):
def __init__(self):
OperationFactory.__init__(self)
gobject.type_register(TransitionFactory)
class SMPTETransitionFactory(TransitionFactory):
"""
......@@ -494,7 +490,6 @@ class SMPTETransitionFactory(TransitionFactory):
def __init__(self):
TransitionFactory.__init__(self)
gobject.type_register(TransitionFactory)
def _update_video_adapter_bin(settings, data):
bin, vscale, ident = data
......
......@@ -104,8 +104,6 @@ class Pitivi(gobject.GObject):
self.current = Project("New Project")
self.emit("new-project", self.current)
gobject.type_register(Pitivi)
def main(argv):
ptv = Pitivi(argv)
gtk.main()
......@@ -275,4 +275,3 @@ class PlayGround(gobject.GObject):
""" seek in the current pipeline """
pass
gobject.type_register(PlayGround)
......@@ -88,7 +88,6 @@ class Project(gobject.GObject):
""" Saves the project to the given file name """
self._save(self, filename)
gobject.type_register(Project)
def file_is_project(uri):
......
......@@ -107,8 +107,6 @@ class ExportSettings(gobject.GObject):
if changed:
self.emit("encoders-changed")
gobject.type_register(ExportSettings)
def available_muxers():
""" return all available muxers """
......
......@@ -138,4 +138,3 @@ class SourceList(gobject.GObject):
elif uri in self.tempsources:
del self.tempsources[uri]
gobject.type_register(SourceList)
......@@ -89,7 +89,6 @@ class Timeline(gobject.GObject):
self.timeline.set_state(gst.STATE_READY)
self.timeline.set_state(pstate)
gobject.type_register(Timeline)
class TimelineObject(gobject.GObject):
"""
......@@ -245,7 +244,6 @@ class TimelineObject(gobject.GObject):
self.emit("start-duration-changed", self.start, self.duration)
gobject.type_register(TimelineObject)
class TimelineSource(TimelineObject):
"""
......@@ -269,7 +267,6 @@ class TimelineSource(TimelineObject):
self.gnlobject.set_property("start", long(0))
self.gnlobject.set_property("duration", long(self.factory.length))
gobject.type_register(TimelineSource)
class TimelineFileSource(TimelineSource):
"""
......@@ -350,7 +347,6 @@ class TimelineFileSource(TimelineSource):
self.emit("media-start-duration-changed",
self.media_start, self.media_duration)
gobject.type_register(TimelineFileSource)
class TimelineLiveSource(TimelineSource):
"""
......@@ -360,7 +356,6 @@ class TimelineLiveSource(TimelineSource):
def __init__(self, **kw):
TimelineSource.__init__(self, **kw)
gobject.type_register(TimelineLiveSource)
class TimelineComposition(TimelineSource):
"""
......@@ -710,7 +705,6 @@ class TimelineComposition(TimelineSource):
# if self.linked and remove_linked, self.linked.remove_source()
pass
gobject.type_register(TimelineComposition)
class TimelineEffect(TimelineObject):
"""
......@@ -728,7 +722,6 @@ class TimelineEffect(TimelineObject):
def _set_up_gnl_operation(self):
""" fill up the gnloperation for the first go """
gobject.type_register(TimelineEffect)
class TimelineSimpleEffect(TimelineEffect):
"""
......@@ -743,7 +736,6 @@ class TimelineSimpleEffect(TimelineEffect):
# fill up the gnloperation for the first go
pass
gobject.type_register(TimelineSimpleEffect)
class TimelineTransition(TimelineEffect):
"""
......@@ -767,7 +759,6 @@ class TimelineTransition(TimelineEffect):
# fill up the gnloperation for the first go
pass
gobject.type_register(TimelineTransition)
class TimelineComplexEffect(TimelineEffect):
"""
......@@ -784,4 +775,3 @@ class TimelineComplexEffect(TimelineEffect):
# fill up the gnloperation for the first go
pass
gobject.type_register(TimelineComplexEffect)
......@@ -320,7 +320,6 @@ class ExportSettingsWidget(GladeWidget):
self.settings.vcodecsettings = self.vcodecsettings
print self.settings
gobject.type_register(ExportSettingsWidget)
class ExportSettingsDialog(gtk.Dialog):
......@@ -339,4 +338,3 @@ class ExportSettingsDialog(gtk.Dialog):
self.setwidget._update_settings()
return self.setwidget.settings
gobject.type_register(ExportSettingsDialog)
......@@ -70,7 +70,6 @@ class GladeWidget(gtk.VBox):
class MyWidget(GladeWidget):
glade_file = 'my_glade_file.glade'
...
gobject.type_register(MyWidget)
Remember to chain up if you customize __init__().
'''
......@@ -113,7 +112,6 @@ class GladeWidget(gtk.VBox):
self.add(w)
win.destroy()
wtree.signal_autoconnect(self)
gobject.type_register(GladeWidget)
class GladeWindow(gobject.GObject):
......@@ -178,4 +176,3 @@ class GladeWindow(gobject.GObject):
self.window.destroy()
del self.window
gobject.type_register(GladeWindow)
......@@ -115,7 +115,6 @@ class GstElementSettingsWidget(gtk.VBox):
d[property.name] = value
return d
gobject.type_register(GstElementSettingsWidget)
class GstElementSettingsDialog(GladeWindow):
......@@ -143,4 +142,3 @@ class GstElementSettingsDialog(GladeWindow):
""" returns the property/value dictionnary of the selected settings """
return self.widgets["elementsettings"].get_settings()
gobject.type_register(GstElementSettingsDialog)
......@@ -163,4 +163,3 @@ class PitiviMainWindow(gtk.Window):
print uri, "is not a project file !"
gobject.type_register(PitiviMainWindow)
......@@ -62,7 +62,6 @@ class SourceFactoriesWidget(gtk.Notebook):
self.transitionlist.set_sensitive(False)
self.append_page(self.transitionlist, gtk.Label("Transitions"))
gobject.type_register(SourceFactoriesWidget)
class SourceListWidget(gtk.VBox):
......@@ -457,7 +456,6 @@ class SourceListWidget(gtk.VBox):
selection.set(selection.target, 8,
string.join(uris, "\n"))
gobject.type_register(SourceListWidget)
class AudioFxListWidget(gtk.VBox):
""" Widget for listing audio effects """
......@@ -469,7 +467,6 @@ class AudioFxListWidget(gtk.VBox):
self.treeview = gtk.TreeView()
self.pack_start(self.iconview)
gobject.type_register(AudioFxListWidget)
class VideoFxListWidget(gtk.VBox):
""" Widget for listing video effects """
......@@ -481,7 +478,6 @@ class VideoFxListWidget(gtk.VBox):
self.treeview = gtk.TreeView()
self.pack_start(self.iconview)
gobject.type_register(VideoFxListWidget)
class TransitionListWidget(gtk.VBox):
""" Widget for listing transitions """
......@@ -493,4 +489,3 @@ class TransitionListWidget(gtk.VBox):
self.treeview = gtk.TreeView()
self.pack_start(self.iconview)
gobject.type_register(TransitionListWidget)
......@@ -89,7 +89,6 @@ class TimelineWidget(gtk.VBox):
self.hscroll.emit("scroll-event", event)
gobject.type_register(TimelineWidget)
class SimpleTimelineContentWidget(gtk.HBox):
""" Widget for Simple Timeline content display """
......@@ -114,7 +113,6 @@ class SimpleTimelineContentWidget(gtk.HBox):
layoutframe.add(self.timeline)
self.pack_start(layoutframe)
gobject.type_register(SimpleTimelineContentWidget)
class ComplexTimelineContentWidget(gtk.HBox):
""" Widget for complex timeline content display """
......@@ -127,4 +125,3 @@ class ComplexTimelineContentWidget(gtk.HBox):
def _create_gui(self):
pass
gobject.type_register(ComplexTimelineContentWidget)
......@@ -312,7 +312,6 @@ class SimpleTimeline(gtk.Layout):
self.set_property("width", newwidth)
gobject.type_register(SimpleTimeline)
class SimpleSourceWidget(gtk.DrawingArea):
......@@ -420,7 +419,6 @@ class SimpleSourceWidget(gtk.DrawingArea):
def _start_duration_changed_cb(self, filesource, start, duration):
self.tooltips.set_tip(self, "start:\t%s\nduration:\t%s" % (beautify_length(start), beautify_length(duration)))
gobject.type_register(SimpleSourceWidget)
class SimpleTransitionWidget(gtk.DrawingArea):
""" Widget for representing a transition in simple timeline view """
......@@ -473,5 +471,4 @@ class SimpleTransitionWidget(gtk.DrawingArea):
x, y, x, y, w, h)
return True
gobject.type_register(SimpleTransitionWidget)
......@@ -399,7 +399,6 @@ class PitiviViewer(gtk.VBox):
self.checktimeoutid = gobject.timeout_add(300, self._check_time)
self.playpause_button.set_play()
gobject.type_register(PitiviViewer)
class ViewerWidget(gtk.DrawingArea):
......@@ -417,7 +416,6 @@ class ViewerWidget(gtk.DrawingArea):
self.videosink.expose()
return False
gobject.type_register(ViewerWidget)
class PlayPauseButton(gtk.Button):
......@@ -450,7 +448,6 @@ class PlayPauseButton(gtk.Button):
self.set_image(gtk.image_new_from_stock(gtk.STOCK_MEDIA_PAUSE, gtk.ICON_SIZE_BUTTON))
self.playing = True
gobject.type_register(PlayPauseButton)
class EncodingDialog(GladeWindow):
glade_file = "encodingdialog.glade"
......@@ -524,4 +521,3 @@ class EncodingDialog(GladeWindow):
self.timeoutid = None
self.destroy()
gobject.type_register(EncodingDialog)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment