X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.h;h=9d8b5b48bbb098599ca8a2ed78a3636a34d4169a;hb=05b414a8e0ea4cefe3b14ea2b6ac5340d12ea1d4;hp=694c03370755519eb93bcc85cc82df3e71551d1f;hpb=2aef03a295cdaf5bfd59c241dd349bf9f02c8d26;p=kdenlive

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 694c0337..9d8b5b48 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -67,6 +67,7 @@ class Waveform;
 class RGBParade;
 class KActionCollection;
 
+
 class MainWindow : public KXmlGuiWindow
 {
     Q_OBJECT
@@ -77,12 +78,13 @@ public:
     /** @brief Initialises the main window.
      * @param MltPath (optional) path to MLT environment
      * @param Url (optional) file to open
+     * @param clipsToLoad (optional) a comma separated list of clips to import in project
      *
      * If Url is present, it will be opened, otherwhise, if openlastproject is
      * set, latest project will be opened. If no file is open after trying this,
      * a default new file will be created. */
     explicit MainWindow(const QString &MltPath = QString(),
-                        const KUrl &Url = KUrl(), QWidget *parent = 0);
+                        const KUrl &Url = KUrl(), const QString & clipsToLoad = QString(), QWidget *parent = 0);
     virtual ~MainWindow();
 
     /** @brief Locates the MLT environment.
@@ -173,6 +175,9 @@ private:
 
     KComboBox *m_timecodeFormat;
 
+    /** This list holds all the scopes used in Kdenlive, allowing to manage some global settings */
+    QList <QDockWidget *> m_scopesList;
+
     QMenu *m_videoEffectsMenu;
     QMenu *m_audioEffectsMenu;
     QMenu *m_customEffectsMenu;
@@ -308,7 +313,7 @@ private slots:
     void slotRaiseMonitor(bool clipMonitor);
     void slotUpdateClip(const QString &id);
     void slotUpdateMousePosition(int pos);
-    void slotAddEffect(const QDomElement effect, GenTime pos = GenTime(), int track = -1);
+    void slotAddEffect(const QDomElement effect);
     void slotEditProfiles();
     void slotDetectAudioDriver();
     void slotEditProjectSettings();
@@ -342,8 +347,8 @@ private slots:
     *
     * Adopted from Dolphin (src/statusbar/dolphinstatusbar.cpp) */
     void slotShowZoomSliderToolTip(int zoomlevel = -1);
-
-    void closeCurrentDocument(bool saveChanges = true);
+    /** @brief Close currently opened document. Returns false if something went wrong (cannot save modifications, ...). */
+    bool closeCurrentDocument(bool saveChanges = true);
     /** @brief Deletes item in timeline, project tree or effect stack depending on focus. */
     void slotDeleteItem();
     void slotAddClipMarker();
@@ -462,6 +467,15 @@ private slots:
     void slotShowTitleBars(bool show);
     void slotSwitchTitles();
 
+    /** @brief The monitor informs that it needs (or not) to have frames sent by the renderer. */
+    void slotMonitorRequestRenderFrame(bool request);
+    /** @brief Check if someone needs the render frame sent. */
+    void slotUpdateScopeFrameRequest();
+    /** @brief Check if someone needs the render frame sent. */
+    void slotDoUpdateScopeFrameRequest();
+    /** @brief When switching between monitors, update the visible scopes. */
+    void slotUpdateColorScopes();
+
 signals:
     Q_SCRIPTABLE void abortRenderJob(const QString &url);
 };