Rename class callbacks to avoid ambiguities with possible class members

diff --git a/python/gst-input-selector-switch.py b/python/gst-input-selector-switch.py
index f653dfa..31b93d0 100755 (executable)
--- a/python/gst-input-selector-switch.py
+++ b/python/gst-input-selector-switch.py
@@ -43,7 +43,7 @@ class Player:
         self.pipeline.set_state(Gst.State.NULL)
         self.loop.quit()
 
         self.pipeline.set_state(Gst.State.NULL)
         self.loop.quit()
 

-    def switch(self):
+    def on_switch(self):

         active_pad = self.selector.get_property("active-pad")
         if active_pad.get_name() == "sink_0":
             new_pad = self.selector.get_static_pad("sink_1")
         active_pad = self.selector.get_property("active-pad")
         if active_pad.get_name() == "sink_0":
             new_pad = self.selector.get_static_pad("sink_1")


@@ -76,7 +76,7 @@ def main():
 
     def stdin_cb(source, condition):
         source.readline()
 
     def stdin_cb(source, condition):
         source.readline()

-        player.switch()
+        player.on_switch()

         return True
 
     GObject.io_add_watch(sys.stdin, GObject.IO_IN, stdin_cb)
         return True
 
     GObject.io_add_watch(sys.stdin, GObject.IO_IN, stdin_cb)

diff --git a/python/gst-playbin-switch.py b/python/gst-playbin-switch.py
index 5333f53..85be7f2 100755 (executable)
--- a/python/gst-playbin-switch.py
+++ b/python/gst-playbin-switch.py
@@ -58,7 +58,7 @@ class Player:
         self.pipeline.set_state(Gst.State.NULL)
         self.loop.quit()
 
         self.pipeline.set_state(Gst.State.NULL)
         self.loop.quit()
 

-    def switch(self):
+    def on_switch(self):

         self.uri_index ^= 1
         print("Next: %s" % self.uris[self.uri_index])
 
         self.uri_index ^= 1
         print("Next: %s" % self.uris[self.uri_index])
 


@@ -94,7 +94,7 @@ def main():
 
     def stdin_cb(source, condition):
         source.readline()
 
     def stdin_cb(source, condition):
         source.readline()

-        player.switch()
+        player.on_switch()

         return True
 
     GObject.io_add_watch(sys.stdin, GObject.IO_IN, stdin_cb)
         return True
 
     GObject.io_add_watch(sys.stdin, GObject.IO_IN, stdin_cb)