Related to weird switching of playback on Maemo 5, putting in asserts to confirm...

[watersofshiloah] / src / windows / _base.py

diff --git a/src/windows/_base.py b/src/windows/_base.py
index 721aeec..d855fd8 100644 (file)
--- a/src/windows/_base.py
+++ b/src/windows/_base.py
@@ -13,7 +13,6 @@ import util.go_utils as go_utils
 
 import stream_index
 import banners
 
 import stream_index
 import banners

-import playcontrol

 import presenter
 
 
 import presenter
 
 

@@ -90,7 +89,7 @@ class BasicWindow(gobject.GObject, go_utils.AutoSignal):
 
        def load_settings(self, config, sectionName):
                try:
 
        def load_settings(self, config, sectionName):
                try:

-                       self._windowInFullscreen = config.getboolean(sectionName, "fullscreen")
+                       windowInFullscreen = config.getboolean(sectionName, "fullscreen")

                except ConfigParser.NoSectionError, e:
                        _moduleLogger.info(
                                "Settings file %s is missing section %s" % (
                except ConfigParser.NoSectionError, e:
                        _moduleLogger.info(
                                "Settings file %s is missing section %s" % (

@@ -99,7 +98,7 @@ class BasicWindow(gobject.GObject, go_utils.AutoSignal):
                                )
                        )
 
                                )
                        )
 

-               if self._windowInFullscreen:
+               if windowInFullscreen:

                        self._window.fullscreen()
                else:
                        self._window.unfullscreen()
                        self._window.fullscreen()
                else:
                        self._window.unfullscreen()

@@ -113,11 +112,14 @@ class BasicWindow(gobject.GObject, go_utils.AutoSignal):
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_window_state_change(self, widget, event, *args):
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_window_state_change(self, widget, event, *args):

+               oldIsFull = self._windowInFullscreen

                if event.new_window_state & gtk.gdk.WINDOW_STATE_FULLSCREEN:
                        self._windowInFullscreen = True
                else:
                        self._windowInFullscreen = False
                if event.new_window_state & gtk.gdk.WINDOW_STATE_FULLSCREEN:
                        self._windowInFullscreen = True
                else:
                        self._windowInFullscreen = False

-               self.emit("fullscreen", self._windowInFullscreen)
+               if oldIsFull != self._windowInFullscreen:
+                       _moduleLogger.info("%r Emit fullscreen %s" % (self, self._windowInFullscreen))
+                       self.emit("fullscreen", self._windowInFullscreen)

 
        @misc_utils.log_exception(_moduleLogger)
        def _on_key_press(self, widget, event, *args):
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_key_press(self, widget, event, *args):

@@ -143,6 +145,7 @@ class BasicWindow(gobject.GObject, go_utils.AutoSignal):
                        event.get_state() & gtk.gdk.CONTROL_MASK
                ):
                        self.emit("quit")
                        event.get_state() & gtk.gdk.CONTROL_MASK
                ):
                        self.emit("quit")

+                       self._window.destroy()

                elif event.keyval == gtk.keysyms.l and event.get_state() & gtk.gdk.CONTROL_MASK:
                        with open(constants._user_logpath_, "r") as f:
                                logLines = f.xreadlines()
                elif event.keyval == gtk.keysyms.l and event.get_state() & gtk.gdk.CONTROL_MASK:
                        with open(constants._user_logpath_, "r") as f:
                                logLines = f.xreadlines()

@@ -156,6 +159,15 @@ class BasicWindow(gobject.GObject, go_utils.AutoSignal):
                self._window.destroy()
 
        @misc_utils.log_exception(_moduleLogger)
                self._window.destroy()
 
        @misc_utils.log_exception(_moduleLogger)

+       def _on_child_fullscreen(self, source, isFull):
+               if isFull:
+                       _moduleLogger.info("Full screen %r to mirror child %r" % (self, source))
+                       self._window.fullscreen()
+               else:
+                       _moduleLogger.info("Unfull screen %r to mirror child %r" % (self, source))
+                       self._window.unfullscreen()
+
+       @misc_utils.log_exception(_moduleLogger)

        def _on_jump(self, source, node):
                raise NotImplementedError("On %s" % self)
 
        def _on_jump(self, source, node):
                raise NotImplementedError("On %s" % self)
 

@@ -188,23 +200,23 @@ class ListWindow(BasicWindow):
                        if column is not None:
                                self._treeView.append_column(column)
 
                        if column is not None:
                                self._treeView.append_column(column)
 

-               viewport = gtk.Viewport()
-               viewport.add(self._treeView)
+               self._viewport = gtk.Viewport()
+               self._viewport.add(self._treeView)

 
                self._treeScroller = gtk.ScrolledWindow()
 
                self._treeScroller = gtk.ScrolledWindow()

-               self._treeScroller.add(viewport)
+               self._treeScroller.add(self._viewport)

                self._treeScroller.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
                self._treeScroller = hildonize.hildonize_scrollwindow(self._treeScroller)
 
                self._separator = gtk.HSeparator()
                self._treeScroller.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
                self._treeScroller = hildonize.hildonize_scrollwindow(self._treeScroller)
 
                self._separator = gtk.HSeparator()

-               self._playcontrol = playcontrol.NavControl(self._player, self._store)
-               self._playcontrol.connect("home", self._on_home)
-               self._playcontrol.connect("jump-to", self._on_jump)
+               self._presenter = presenter.NavControl(self._player, self._store)
+               self._presenter.connect("home", self._on_home)
+               self._presenter.connect("jump-to", self._on_jump)

 
                self._contentLayout = gtk.VBox(False)
                self._contentLayout.pack_start(self._treeScroller, True, True)
                self._contentLayout.pack_start(self._separator, False, True)
 
                self._contentLayout = gtk.VBox(False)
                self._contentLayout.pack_start(self._treeScroller, True, True)
                self._contentLayout.pack_start(self._separator, False, True)

-               self._contentLayout.pack_start(self._playcontrol.toplevel, False, True)
+               self._contentLayout.pack_start(self._presenter.toplevel, False, True)

 
                self._layout.pack_start(self._loadingBanner.toplevel, False, False)
                self._layout.pack_start(self._contentLayout, True, True)
 
                self._layout.pack_start(self._loadingBanner.toplevel, False, False)
                self._layout.pack_start(self._contentLayout, True, True)

@@ -216,7 +228,7 @@ class ListWindow(BasicWindow):
                self._loadingBanner.toplevel.hide()
 
                self._refresh()
                self._loadingBanner.toplevel.hide()
 
                self._refresh()

-               self._playcontrol.refresh()
+               self._presenter.refresh()

 
        @classmethod
        def _get_columns(cls):
 
        @classmethod
        def _get_columns(cls):

@@ -257,6 +269,7 @@ class ListWindow(BasicWindow):
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_player_title_change(self, player, node):
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_player_title_change(self, player, node):

+               assert not self._isDestroyed

                self._select_row()
 
        @misc_utils.log_exception(_moduleLogger)
                self._select_row()
 
        @misc_utils.log_exception(_moduleLogger)

@@ -274,6 +287,10 @@ class ListWindow(BasicWindow):
                window = self._window_from_node(child)
                window.jump_to(node)
 
                window = self._window_from_node(child)
                window.jump_to(node)
 

+       @misc_utils.log_exception(_moduleLogger)
+       def _on_delay_scroll(self, *args):
+               self._scroll_to_row()
+

        def _show_loading(self):
                animationPath = self._store.STORE_LOOKUP["loading"]
                animation = self._store.get_pixbuf_animation_from_store(animationPath)
        def _show_loading(self):
                animationPath = self._store.STORE_LOOKUP["loading"]
                animation = self._store.get_pixbuf_animation_from_store(animationPath)

@@ -291,9 +308,30 @@ class ListWindow(BasicWindow):
                if rowIndex < 0:
                        return
                path = (rowIndex, )
                if rowIndex < 0:
                        return
                path = (rowIndex, )

-               self._treeView.scroll_to_cell(path)

                self._treeView.get_selection().select_path(path)
 
                self._treeView.get_selection().select_path(path)
 

+       def _scroll_to_row(self):
+               rowIndex = self._get_current_row()
+               if rowIndex < 0:
+                       return
+
+               path = (rowIndex, )
+               self._treeView.scroll_to_cell(path)
+
+               treeViewHeight = self._treeView.get_allocation().height
+               viewportHeight = self._viewport.get_allocation().height
+
+               viewsPerPort = treeViewHeight / float(viewportHeight)
+               maxRows = len(self._model)
+               percentThrough = rowIndex / float(maxRows)
+               dxByIndex = int(viewsPerPort * percentThrough * viewportHeight)
+
+               dxMax = max(treeViewHeight - viewportHeight, 0)
+
+               dx = min(dxByIndex, dxMax)
+               adjustment = self._treeScroller.get_vadjustment()
+               adjustment.value = dx
+

 
 class PresenterWindow(BasicWindow):
 
 
 class PresenterWindow(BasicWindow):
 

@@ -382,6 +420,7 @@ class PresenterWindow(BasicWindow):
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_player_state_change(self, player, newState):
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_player_state_change(self, player, newState):

+               assert not self._isDestroyed

                if self._active and self._player.state == self._player.STATE_PLAY:
                        self._seekbar.show()
                        assert self._updateSeek is None
                if self._active and self._player.state == self._player.STATE_PLAY:
                        self._seekbar.show()
                        assert self._updateSeek is None

@@ -398,15 +437,17 @@ class PresenterWindow(BasicWindow):
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_player_title_change(self, player, node):
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_player_title_change(self, player, node):

+               assert not self._isDestroyed

                if not self._active or node in [None, self._node]:
                if not self._active or node in [None, self._node]:

-                       self._playerNode = player.node
+                       self._playerNode = node

                        return
                        return

-               self._playerNode = player.node
+               self._playerNode = node

                self.emit("jump-to", node)
                self._window.destroy()
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_player_error(self, player, err, debug):
                self.emit("jump-to", node)
                self._window.destroy()
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_player_error(self, player, err, debug):

+               assert not self._isDestroyed

                _moduleLogger.error("%r - %r" % (err, debug))
 
        @misc_utils.log_exception(_moduleLogger)
                _moduleLogger.error("%r - %r" % (err, debug))
 
        @misc_utils.log_exception(_moduleLogger)