[vlc-commits] qml: move the autoloader mechanism of the Maxiplayer to the main browsing view

[Pierre Lamot]

vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Oct 16 10:05:57 2020 +0200| [96f4d529d852e1596852f1766b6743ac43bcd456] | committer: Pierre Lamot

qml: move the autoloader mechanism of the Maxiplayer to the main browsing view

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=96f4d529d852e1596852f1766b6743ac43bcd456
---

 modules/gui/qt/maininterface/qml/MainDisplay.qml   | 10 ++++++++++
 modules/gui/qt/maininterface/qml/MainInterface.qml | 11 -----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/modules/gui/qt/maininterface/qml/MainDisplay.qml b/modules/gui/qt/maininterface/qml/MainDisplay.qml
index a8abc20740..c3a9c5f6c6 100644
--- a/modules/gui/qt/maininterface/qml/MainDisplay.qml
+++ b/modules/gui/qt/maininterface/qml/MainDisplay.qml
@@ -381,6 +381,16 @@ Widgets.NavigableFocusScope {
 
                 mainContent: mainColumn
             }
+
+            Connections {
+                target: player.videoTracks
+                onDataChanged: {
+                    if (player.videoTracks.rowCount() > 0
+                            && player.playingState === PlayerController.PLAYING_STATE_PLAYING) {
+                        g_mainDisplay.showPlayer()
+                    }
+                }
+            }
         }
     }
 }
diff --git a/modules/gui/qt/maininterface/qml/MainInterface.qml b/modules/gui/qt/maininterface/qml/MainInterface.qml
index 69c54aa305..d3f4016405 100644
--- a/modules/gui/qt/maininterface/qml/MainInterface.qml
+++ b/modules/gui/qt/maininterface/qml/MainInterface.qml
@@ -149,17 +149,6 @@ Rectangle {
                     }
                 }
             }
-
-            Connections {
-                target: player.videoTracks
-                onDataChanged: {
-                    if (player.videoTracks.rowCount() > 0
-                            && player.playingState === PlayerController.PLAYING_STATE_PLAYING
-                            && history.current.view !== "player") {
-                        history.push(["player"])
-                    }
-                }
-            }
         }
     }