pitivi r1158 - in branches/SOC_2008_BLEWIS: . pitivi/timeline

[edwardrv svn gnome org]

Author: edwardrv
Date: Wed Jul  9 11:18:50 2008
New Revision: 1158
URL: http://svn.gnome.org/viewvc/pitivi?rev=1158&view=rev

Log:
* pitivi/timeline/source.py:
Add isAudio() and isVideo() methods for timeline objects.
* pitivi/timeline/composition.py:
* pitivi/timeline/objects.py:
Use API added above for code readability.


Modified:
   branches/SOC_2008_BLEWIS/ChangeLog
   branches/SOC_2008_BLEWIS/pitivi/timeline/composition.py
   branches/SOC_2008_BLEWIS/pitivi/timeline/objects.py
   branches/SOC_2008_BLEWIS/pitivi/timeline/source.py

Modified: branches/SOC_2008_BLEWIS/pitivi/timeline/composition.py
==============================================================================
--- branches/SOC_2008_BLEWIS/pitivi/timeline/composition.py	(original)
+++ branches/SOC_2008_BLEWIS/pitivi/timeline/composition.py	Wed Jul  9 11:18:50 2008
@@ -27,7 +27,7 @@
 import gst
 
 from source import TimelineSource
-from objects import BrotherObjects, MEDIA_TYPE_AUDIO
+from objects import BrotherObjects
 from pitivi.serializable import to_object_from_data_type
 
 class Layer(BrotherObjects):
@@ -769,7 +769,7 @@
             # return the settings of our only source
             return self.sources[0][2][0].getExportSettings()
         else:
-            if self.media_type == MEDIA_TYPE_AUDIO:
+            if self.isAudio():
                 return self._autoAudioSettings()
             else:
                 return self._autoVideoSettings()

Modified: branches/SOC_2008_BLEWIS/pitivi/timeline/objects.py
==============================================================================
--- branches/SOC_2008_BLEWIS/pitivi/timeline/objects.py	(original)
+++ branches/SOC_2008_BLEWIS/pitivi/timeline/objects.py	Wed Jul  9 11:18:50 2008
@@ -425,3 +425,9 @@
             self._setFactory(obj)
         else:
             BrotherObjects.pendingObjectCreated(self, obj, field)
+
+    def isAudio(self):
+        return self.media_type == MEDIA_TYPE_AUDIO
+
+    def isVideo(self):
+        return self.media_type == MEDIA_TYPE_VIDEO

Modified: branches/SOC_2008_BLEWIS/pitivi/timeline/source.py
==============================================================================
--- branches/SOC_2008_BLEWIS/pitivi/timeline/source.py	(original)
+++ branches/SOC_2008_BLEWIS/pitivi/timeline/source.py	Wed Jul  9 11:18:50 2008
@@ -52,11 +52,11 @@
         TimelineObject.__init__(self, **kw)
 
     def _makeGnlObject(self):
-        if self.media_type == MEDIA_TYPE_AUDIO:
+        if self.isAudio():
             # silent audiotestsrc
             src = gst.element_factory_make("audiotestsrc")
             src.set_property("volume", 0)
-        elif self.media_type == MEDIA_TYPE_VIDEO:
+        elif self.isVideo():
             # black videotestsrc
             src = gst.element_factory_make("videotestsrc")
             src.props.pattern = 2
@@ -94,10 +94,10 @@
 
     def _makeGnlObject(self):
         gst.log("creating object")
-        if self.media_type == MEDIA_TYPE_AUDIO:
+        if self.isAudio():
             caps = gst.caps_from_string("audio/x-raw-int;audio/x-raw-float")
             postfix = "audio"
-        elif self.media_type == MEDIA_TYPE_VIDEO:
+        elif self.isVideo():
             caps = gst.caps_from_string("video/x-raw-yuv;video/x-raw-rgb")
             postfix = "video"
         else:
@@ -106,7 +106,7 @@
 
         gnlobject = gst.element_factory_make("gnlsource", "source-" + self.name + "-" + postfix + str(self.factory.lastbinid))
         self.decodebin = SingleDecodeBin(caps=caps, uri=self.factory.name)
-        if self.media_type == MEDIA_TYPE_AUDIO:
+        if self.isAudio():
             self.volumeElement = gst.element_factory_make("volume", "internal-volume")
             self.audioconv = gst.element_factory_make("audioconvert", "fdsjkljf")
             self.volumeBin = gst.Bin("volumebin")
@@ -154,7 +154,7 @@
         #FIXME: we need a volume-changed signal, so that UI updates
 
     def setVolume(self, level):
-        if self.media_type == MEDIA_TYPE_AUDIO:
+        if self.isAudio():
             self._setVolume(level)
         else:
             self.linked._setVolume(level)
@@ -165,14 +165,14 @@
         # find out if the factory provides the other element type
         if self.media_type == MEDIA_TYPE_NONE:
             return None
-        if self.media_type == MEDIA_TYPE_VIDEO:
+        if self.isVideo():
             if not self.factory.is_audio:
                 return None
             brother = TimelineFileSource(media_start=self.media_start, media_duration=self.media_duration,
                                          factory=self.factory, start=self.start, duration=self.duration,
                                          media_type=MEDIA_TYPE_AUDIO,
                                          name=self.name + "-brother")
-        elif self.media_type == MEDIA_TYPE_AUDIO:
+        elif self.isAudio():
             if not self.factory.is_video:
                 return None
             brother = TimelineFileSource(media_start=self.media_start, media_duration=self.media_duration,
@@ -244,7 +244,7 @@
         ret = TimelineSource.toDataFormat(self)
         ret["media-start"] = self.media_start
         ret["media-duration"] = self.media_duration
-        if self.media_type == MEDIA_TYPE_AUDIO and hasattr(self, "volumeElement"):
+        if self.isAudio() and hasattr(self, "volumeElement"):
             ret["volume"] = self.volumeElement.get_property("volume")
         return ret