altering to ogg from mkv

3 files changed, 12 insertions, 12 deletions

diff --git a/src/freeseer-gui-qt.py b/src/freeseer-gui-qt.py
index 60e57d0..05ff516 100755
--- a/src/freeseer-gui-qt.py
+++ b/src/freeseer-gui-qt.py
@@ -33,7 +33,7 @@ CONFIG = dict()
 # Initialize some defaults
 PWD = os.getcwd()
 TALKSFILE = sys.path[0] + '/talks.txt'
-CONFIG['FILENAME'] = 'default.mkv'
+CONFIG['FILENAME'] = 'default.ogg'
 CONFIG['FILE_INDEX'] = 0
 CONFIG['VODEVICE'] = '/dev/video0'
 CONFIG['VODRIVER'] = 'v4l2src'
@@ -189,7 +189,7 @@ class MainApp(QtGui.QWidget):
         talkLabel = QtGui.QLabel('Title:')
         talkLabel.setMaximumWidth(50)
         self.talk = QtGui.QComboBox()
-        self.talk.addItem('Foo Bar - Test Presentation')
+        self.talk.addItem('Foo_Bar-Test_Presentation')
         self.talkEditButton = QtGui.QPushButton("Edit")
         self.talkEditButton.setMaximumWidth(50)
         talkLayout = QtGui.QHBoxLayout()
@@ -269,7 +269,7 @@ class MainApp(QtGui.QWidget):
     def checkFileExists(self):
         i = 0
         while True:
-            CONFIG['FILENAME'] = QtCore.QDate.currentDate().toString(QtCore.Qt.ISODate) + " " + self.talk.currentText() + " (" + str(i) + ").mkv"
+            CONFIG['FILENAME'] = QtCore.QDate.currentDate().toString(QtCore.Qt.ISODate) + "_" + self.talk.currentText() + "-" + str(i) + ".ogg"
             rfile = QtCore.QFileInfo(CONFIG['FILENAME'])
 
             if (rfile.exists()):
diff --git a/src/freeseer.py b/src/freeseer.py
index d88abba..138580c 100755
--- a/src/freeseer.py
+++ b/src/freeseer.py
@@ -29,7 +29,7 @@ class FreeSeeR:
         
         self.viddrv = 'v4lsrc'
         self.viddev = '/dev/video0'
-        self.filename = 'default.mkv'
+        self.filename = 'default.ogg'
         self.video_codec = 'theoraenc'
         self.audio_codec = 'vorbisenc'
         
@@ -47,15 +47,16 @@ class FreeSeeR:
         # GST Video Filtering
         self.fvidrate = gst.element_factory_make("videorate", "fvidrate")
         self.fvidrate_cap = gst.element_factory_make("capsfilter", "fvidrate_cap")
-        self.fvidrate_cap.set_property('caps', gst.caps_from_string('video/x-raw-yuv, framerate=25/1'))
+        self.fvidrate_cap.set_property('caps', gst.caps_from_string('video/x-raw-rgb, framerate=25/1, silent'))
         self.fvidscale = gst.element_factory_make("videoscale", "fvidscale")
         self.fvidscale_cap = gst.element_factory_make("capsfilter", "fvidscale_cap")
-        self.fvidscale_cap.set_property('caps', gst.caps_from_string('video/x-raw-yuv, width=720, height=480'))
+        self.fvidscale_cap.set_property('caps', gst.caps_from_string('video/x-raw-yuv, width=320, height=240'))
         self.fvidcspace = gst.element_factory_make("ffmpegcolorspace", "fvidcspace")
         
 
         # GST Sound
-        self.sndsrc = gst.element_factory_make("alsasrc", "sndsrc")
+        self.sndsrc = gst.element_factory_make("pulsesrc", "sndsrc")
+#        self.sndsrc.set_property("device", "alsa_output.pci-0000_00_1b.0.analog-stereo")
         self.sndtee = gst.element_factory_make("tee", "sndtee")
         self.sndqueue1 = gst.element_factory_make("queue", "sndqueue1")
         self.sndqueue2 = gst.element_factory_make("queue", "sndqueue2")
@@ -64,9 +65,9 @@ class FreeSeeR:
         self.sndsink = gst.element_factory_make("autoaudiosink", "sndsink")
 
         # GST Muxer
-        self.mux = gst.element_factory_make("matroskamux", "mux")
+        self.mux = gst.element_factory_make("oggmux", "mux")
         self.filesink = gst.element_factory_make("filesink", "filesink")
-        self.filesink.set_property("location", 'default.mkv')
+        self.filesink.set_property("location", 'default.ogg')
 
         # GST Add Components
         self.player.add(self.vidsrc, self.cspace, self.vidtee, self.vidqueue1, self.vidcodec)
@@ -181,4 +182,4 @@ class FreeSeeR:
         gst.element_link_many(self.sndtee, self.sndqueue2, self.sndsink)
 
     def disable_audio_feedback(self):
-        self.player.remove(self.sndqueue2, self.sndsink)
\ No newline at end of file
+        self.player.remove(self.sndqueue2, self.sndsink)
diff --git a/src/talks.txt b/src/talks.txt
index 5a70aa6..351be5b 100755
--- a/src/talks.txt
+++ b/src/talks.txt
@@ -1,2 +1 @@
-Thanh Ha - Intro to PyQt4
-Thanh Ha - Intro to freeseer
+mine