[pitivi] Fix the etree formatter, settings and encoding dialog when working with raw streams.

[Edward Hervey <edwardrv src gnome org>]

commit 1ef40b2467d3e339a44568611cbdc5dda48ae465
Author: Alessandro Decina <alessandro d gmail com>
Date:   Fri Jun 26 13:17:37 2009 +0200

    Fix the etree formatter, settings and encoding dialog when working with raw streams.

 pitivi/formatters/etree.py  |    4 ++--
 pitivi/settings.py          |    2 +-
 pitivi/ui/encodingdialog.py |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/pitivi/formatters/etree.py b/pitivi/formatters/etree.py
index b82ad46..167cd07 100644
--- a/pitivi/formatters/etree.py
+++ b/pitivi/formatters/etree.py
@@ -268,8 +268,8 @@ class ElementTreeFormatter(Formatter):
         element.attrib["audiochannels"] = str(int(settings.audiochannels))
         element.attrib["audiorate"] = str(int(settings.audiorate))
         element.attrib["audiodepth"] = str(int(settings.audiodepth))
-        element.attrib["vencoder"] = settings.vencoder
-        element.attrib["aencoder"] = settings.aencoder
+        element.attrib["vencoder"] = settings.vencoder or ""
+        element.attrib["aencoder"] = settings.aencoder or ""
         element.attrib["muxer"] = settings.muxer
 
         # container/encoder settings
diff --git a/pitivi/settings.py b/pitivi/settings.py
index 1e39b4a..13c2336 100644
--- a/pitivi/settings.py
+++ b/pitivi/settings.py
@@ -502,7 +502,7 @@ class ExportSettings(Signallable, Loggable):
     def getAudioDescription(self):
         """ Returns a human-readable markup-ed string describing the audio properties """
         res = "%d channels at %d <i>Hz</i> (%d <i>bits</i>) <i>(%s)</i>"
-        return res % (self.audiochannels, self.audiorate, self.audiodepth, self.aencoder)
+        return res % (self.audiochannels, self.audiorate, self.audiodepth, self.aencoder or "raw")
 
     def getAudioCaps(self):
         """ Returns the GstCaps corresponding to the audio settings """
diff --git a/pitivi/ui/encodingdialog.py b/pitivi/ui/encodingdialog.py
index cdf59b7..ee007f1 100644
--- a/pitivi/ui/encodingdialog.py
+++ b/pitivi/ui/encodingdialog.py
@@ -83,10 +83,10 @@ class EncodingDialog(GladeWindow, Loggable):
         self.destroy()
 
     def _displaySettings(self):
-        if self.settings.vencoder:
+        if self.settings.vencoder is not None:
             self.vinfo.set_markup(self.settings.getVideoDescription())
 
-        if self.settings.aencoder:
+        if self.settings.aencoder is not None:
             self.ainfo.set_markup(self.settings.getAudioDescription())
 
     def _fileButtonClickedCb(self, button):