Fixmes Corrections.

4 files changed, 13 insertions, 20 deletions

diff --git a/glive.py b/glive.py
index d9caf49..733ecbb 100644
--- a/glive.py
+++ b/glive.py
@@ -345,10 +345,9 @@ class Glive:
         return self._xbin.get_by_name("xsink")
 
     def play(self, use_xv=True):
-        # TypeError: get_state() takes exactly 2 arguments (1 given)
-        #if self._get_state() == Gst.State.PLAYING:
-        #    return
-        pass
+        
+        if self._get_state() == Gst.State.PLAYING:
+            return
 
         if self._has_camera:
             if use_xv and self._xv_available:
@@ -375,9 +374,7 @@ class Glive:
         return self._playing
 
     def _get_state(self):
-        # FIXME: TypeError: get_state() takes exactly 2 arguments (1 given)
-        #return self._pipeline.get_state()[1]
-        pass
+        return self._pipeline.get_state(0)[1]
 
     def stop_recording_audio(self):
         # We should be able to simply pause and remove the audiobin, but
diff --git a/gplay.py b/gplay.py
index 528872c..f0016f6 100644
--- a/gplay.py
+++ b/gplay.py
@@ -108,15 +108,13 @@ class Gplay(GObject.GObject):
         return True
 
     def _emit_playback_status(self, position):
-        # FIXME: TypeError: get_state() takes exactly 2 arguments (1 given)
-        #state = self._player.get_state()[1]
-        #self.emit('playback-status-changed', state, position)
-        pass
+        
+        state = self._player.get_state(0)[1]
+        self.emit('playback-status-changed', state, position)
 
     def get_state(self):
-        # FIXME: TypeError: get_state() takes exactly 2 arguments (1 given)
-        #return self._player.get_state()[1]
-        pass
+        
+        return self._player.get_state(0)[1]
 
     def stop(self):
         if self._playback_monitor_handler:
diff --git a/mediaview.py b/mediaview.py
index 1f81ec3..708c073 100644
--- a/mediaview.py
+++ b/mediaview.py
@@ -134,10 +134,8 @@ class InfoView(Gtk.EventBox):
         self._tags_buffer.set_text(tags)
 
     def _size_allocate(self, widget, allocation):
-        # FIXME: AttributeError: 'EventBox' object has no attribute 'allocation'
-        #self.emit('primary-allocated', self._view_bg.allocation)
-        #self.emit('secondary-allocated', self._live_bg.allocation)
-        pass
+        self.emit('primary-allocated', self._view_bg.get_allocation())
+        self.emit('secondary-allocated', self._live_bg.get_allocation())
 
     def _tags_changed(self, widget):
         self.emit('tags-changed', widget)
diff --git a/record.py b/record.py
index 8b5c481..f8de898 100644
--- a/record.py
+++ b/record.py
@@ -255,8 +255,8 @@ class Record(activity.Activity):
 
         if self.model.ui_frozen():
             return False
-        # FIXME: Gtk.keysyms ? Gdk.CONTROL_MASK ?
-        if key == Gtk.keysyms.c and event.state == Gdk.CONTROL_MASK:
+
+        if key == Gtk.keysyms.c and event.state == Gdk.ModifierType.CONTROL_MASK:
             self._copy_to_clipboard(self._active_recd)
         elif key == Gtk.keysyms.i:
             self._toggle_info()