[pitivi] Remove everything related to the webcam import feature
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Remove everything related to the webcam import feature
- Date: Mon, 6 Jun 2011 05:12:12 +0000 (UTC)
commit da308a4c780ca8eb33cc99a321ed3501b2c272f1
Author: Thibault Saunier <thibault saunier collabora co uk>
Date: Thu May 26 12:02:54 2011 -0400
Remove everything related to the webcam import feature
data/ui/Makefile.am | 1 -
data/ui/cam_capture.ui | 134 ---------------
data/ui/mainwindow.xml | 1 -
pitivi/Makefile.am | 1 -
pitivi/application.py | 4 -
pitivi/device.py | 331 -------------------------------------
pitivi/ui/Makefile.am | 1 -
pitivi/ui/mainwindow.py | 30 ----
pitivi/ui/webcam_managerdialog.py | 261 -----------------------------
po/POTFILES.in | 1 -
10 files changed, 0 insertions(+), 765 deletions(-)
---
diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
index 4d9282e..2a2dd4a 100644
--- a/data/ui/Makefile.am
+++ b/data/ui/Makefile.am
@@ -1,7 +1,6 @@
uidir = $(pkgdatadir)/ui
ui_DATA = \
elementsettingsdialog.ui \
- cam_capture.ui \
encodingdialog.ui \
encodingprogress.ui \
filelisterrordialog.ui \
diff --git a/data/ui/mainwindow.xml b/data/ui/mainwindow.xml
index 762d3c8..81c72fb 100644
--- a/data/ui/mainwindow.xml
+++ b/data/ui/mainwindow.xml
@@ -26,7 +26,6 @@
<menu action="Library">
<menuitem action="RenderProject" />
<separator />
- <menuitem action="ImportfromCam" />
<menuitem action="NetstreamCapture" />
<menuitem action="Screencast" />
<placeholder name="SourceList" />
diff --git a/pitivi/Makefile.am b/pitivi/Makefile.am
index 321cc14..5c1bb5d 100644
--- a/pitivi/Makefile.am
+++ b/pitivi/Makefile.am
@@ -15,7 +15,6 @@ pitivi_PYTHON = \
application.py \
check.py \
configure.py \
- device.py \
discoverer.py \
effects.py \
encode.py \
diff --git a/pitivi/application.py b/pitivi/application.py
index 1449cc5..e5a055d 100644
--- a/pitivi/application.py
+++ b/pitivi/application.py
@@ -133,7 +133,6 @@ class Pitivi(Loggable, Signallable):
self.settings.get_local_plugin_path(),
self.settings.get_plugin_settings_path())
self.effects = EffectsHandler()
- self.deviceprobe = None
self.projectManager = ProjectManager(self.effects)
self._connectToProjectManager(self.projectManager)
@@ -160,9 +159,6 @@ class Pitivi(Loggable, Signallable):
return False
self.threads.stopAllThreads()
self.settings.storeSettings()
- if self.deviceprobe:
- self.deviceprobe.release()
- self.deviceprobe = None
self.current = None
instance.PiTiVi = None
self.emit("shutdown")
diff --git a/pitivi/ui/Makefile.am b/pitivi/ui/Makefile.am
index ea8d19c..1563c3e 100644
--- a/pitivi/ui/Makefile.am
+++ b/pitivi/ui/Makefile.am
@@ -39,7 +39,6 @@ ui_PYTHON = \
videofxlist.py \
viewer.py \
view.py \
- webcam_managerdialog.py \
effectlist.py \
clipproperties.py \
effectsconfiguration.py \
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index a29b660..892e7e9 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -223,17 +223,6 @@ class PitiviMainWindow(gtk.Window, Loggable):
self.app.action_log.connect("redo", self._actionLogRedo)
self.app.action_log.connect("cleaned", self._actionLogCleaned)
- # if no webcams available, hide the webcam action
- if self.app.deviceprobe is not None:
- # On Windows disable device probe
- if platform.system() != 'Windows':
- self.app.deviceprobe.connect("device-added", self._deviceChangeCb)
- self.app.deviceprobe.connect("device-removed", self._deviceChangeCb)
- if len(self.app.deviceprobe.getVideoSourceDevices()) < 1:
- self.webcam_button.set_sensitive(False)
- else:
- self.webcam_button.set_sensitive(False)
-
def showEncodingDialog(self, project, pause=True):
"""
Shows the L{EncodingDialog} for the given project Timeline.
@@ -290,9 +279,6 @@ class PitiviMainWindow(gtk.Window, Loggable):
None, _("Manage plugins"), self._pluginManagerCb),
("Preferences", gtk.STOCK_PREFERENCES, _("_Preferences"),
None, None, self._prefsCb),
- ("ImportfromCam", gtk.STOCK_ADD ,
- _("Import from _Webcam..."),
- None, _("Import Camera stream"), self._ImportWebcam),
("Screencast", gtk.STOCK_ADD ,
_("_Make screencast..."),
None, _("Capture the desktop"), self._Screencast),
@@ -350,9 +336,6 @@ class PitiviMainWindow(gtk.Window, Loggable):
# this will be set sensitive when the timeline duration changes
action.set_sensitive(False)
action.props.is_important = True
- elif action_name == "ImportfromCam":
- self.webcam_button = action
- action.set_sensitive(False)
elif action_name == "Screencast":
# FIXME : re-enable this action once istanbul integration is complete
# and upstream istanbul has applied packages for proper interaction.
@@ -718,12 +701,6 @@ class PitiviMainWindow(gtk.Window, Loggable):
from pluginmanagerdialog import PluginManagerDialog
PluginManagerDialog(self.app.plugin_manager)
- # Import from Webcam callback
- def _ImportWebcam(self,unused_action):
- from webcam_managerdialog import WebcamManagerDialog
- w = WebcamManagerDialog(self.app)
- w.show()
-
# Capture network stream callback
def _ImportNetstream(self,unused_action):
from netstream_managerdialog import NetstreamManagerDialog
@@ -734,13 +711,6 @@ class PitiviMainWindow(gtk.Window, Loggable):
from screencast_managerdialog import ScreencastManagerDialog
ScreencastManagerDialog(self.app)
- ## Devices changed
- def _deviceChangeCb(self, probe, unused_device):
- if len(probe.getVideoSourceDevices()) < 1:
- self.webcam_button.set_sensitive(False)
- else:
- self.webcam_button.set_sensitive(True)
-
def _hideChildWindow(self, window, event):
window.hide()
return True
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b952857..13781a1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,6 @@
# Please keep this file sorted alphabetically.
# [encoding: UTF-8]
data/pitivi.desktop.in.in
-data/ui/cam_capture.ui
data/ui/elementsettingsdialog.ui
data/ui/encodingdialog.ui
data/ui/encodingprogress.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]