Revision 71455e67 py/scenic/preview.py
| b/py/scenic/preview.py | ||
|---|---|---|
| 67 | 67 |
log.error("XID of the preview drawing area is 0L!")
|
| 68 | 68 |
else: |
| 69 | 69 |
x_window_id = self.app.gui.preview_socket.get_id() |
| 70 |
command = "milhouse --videosource %s --localvideo --window-title \"%s\" --width %s --height %s --aspect-ratio %s --flip-video %s" % (self.app.config.video_source, window_title, width, height, aspect_ratio, flip) |
|
| 70 |
command = "milhouse --videosource %s --localvideo --window-title \"%s\" "\ |
|
| 71 |
"--width %s --height %s --aspect-ratio %s --flip-video %s --framerate 30"\ |
|
| 72 |
% (self.app.config.video_source, window_title, width, height, aspect_ratio, flip) |
|
| 71 | 73 |
# fullscreen |
| 72 | 74 |
if self.app.config.video_fullscreen: |
| 73 | 75 |
command += " --fullscreen" |
| ... | ... | |
| 84 | 86 |
command += " --videodisplay %s" % (self.app.config.video_display) # xid does not work if DISPLAY is set to an other display. |
| 85 | 87 |
if self.app.config.video_source != "videotestsrc": |
| 86 | 88 |
dev = self.app.parse_v4l2_device_name(self.app.config.video_device) |
| 89 |
log.debug("our device is: %s" % (dev))
|
|
| 87 | 90 |
if dev is None: |
| 88 | 91 |
log.error("v4l2 device is not found ! %s" % (self.app.config.video_device))
|
| 92 |
log.debug("Checking for firewire device")
|
|
| 93 |
video_device = self.app.parse_v4l2_device_name(self.app.config.video_device) |
|
| 89 | 94 |
#FIXME: handle this |
| 90 |
video_device = dev["name"] |
|
| 91 |
command += " --videodevice %s" % (video_device) |
|
| 95 |
else: |
|
| 96 |
video_device = dev["name"] |
|
| 97 |
command += " --videodevice %s" % (video_device) |
|
| 92 | 98 |
return command |
| 93 | 99 |
|
| 94 | 100 |
def start(self): |
Also available in: Unified diff