git.asbjorn.biz
/
talkcutter.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tree for svenne
[talkcutter.git]
/
src
/
talkcutter.py
diff --git
a/src/talkcutter.py
b/src/talkcutter.py
index
bf91923
..
276fd68
100755
(executable)
--- a/
src/talkcutter.py
+++ b/
src/talkcutter.py
@@
-3,6
+3,9
@@
import os
import gst, gtk, gobject
import sys
from videoplayer import videoplayer
import gst, gtk, gobject
import sys
from videoplayer import videoplayer
+from audioplayer import audioplayer
+from tree import tree
+
try:
import pygtk
pygtk.require("2.0")
try:
import pygtk
pygtk.require("2.0")
@@
-34,14
+37,20
@@
class TalkCutter:
print self.drawingarea
print self.drawingarea
+ self.audio = audioplayer(self)
+ self.audio.play('file:///mnt/dl/dkuug/video/osd10/dan/dan.wav');
+
self.video = videoplayer(self)
self.video.play('file:///mnt/dl/dkuug/video/osd10/dan/dan.dv')
self.video = videoplayer(self)
self.video.play('file:///mnt/dl/dkuug/video/osd10/dan/dan.dv')
+ self.tree = tree()
+ self.wTree.get_widget('hpaned6').add(self.tree.get_tree())
+
print self.wTree.get_widget('dMain').show()
print self.wTree.get_widget('dMain').show()
+
self.wTree.visible = True
gtk.main()
self.wTree.visible = True
gtk.main()
-
def on_destroy(self, window):
self.playbin.set_state(gst.STATE_NULL)
gtk.main_quit()
def on_destroy(self, window):
self.playbin.set_state(gst.STATE_NULL)
gtk.main_quit()
@@
-55,5
+64,10
@@
class TalkCutter:
sys.exit(0)
if __name__ == "__main__":
sys.exit(0)
if __name__ == "__main__":
+ try:
TalkCutter()
TalkCutter()
+ except KeyboardInterrupt:
+ print ''
+ except SystemExit:
+ pass