Try to fix audio mixing bug ( http://www.kdenlive.org:80/mantis/view.php?id=228 )

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 2b1102784169660d7d96afa777e549d5cbd5000d..95d5ec2213b76c93eb5a440f596d9abfd8a806a7 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -293,13 +293,21 @@ QStringList Monitor::mimeTypes() const {
 
 
 // virtual
+/** Move to other position on mousewheel
+ *
+ * Moves towards end of clip/timeline on mousewheel down/back,
+ * opposite for mousewheel up/forward.
+ *
+ * Ctrl+wheel moves single frame, without Ctrl moves a second.
+ *
+ * See also http://www.kdenlive.org/mantis/view.php?id=265 */
 void Monitor::wheelEvent(QWheelEvent * event) {
     if (event->modifiers() == Qt::ControlModifier) {
         int delta = m_monitorManager->timecode().fps();
         if (event->delta() < 0) delta = 0 - delta;
-        slotSeek(m_position + delta);
+        slotSeek(m_position - delta);
     } else {
-        if (event->delta() > 0) slotForwardOneFrame();
+        if (event->delta() <= 0) slotForwardOneFrame();
         else slotRewindOneFrame();
     }
 }
@@ -549,6 +557,13 @@ void Monitor::saveSceneList(QString path, QDomElement info) {
     render->saveSceneList(path, info);
 }
 
+QDomDocument Monitor::sceneList() {
+    if (render == NULL) return QDomDocument();
+    QDomDocument doc;
+    doc.setContent(render->sceneList());
+    return doc;
+}
+
 MonitorRefresh::MonitorRefresh(QWidget* parent): QWidget(parent), m_renderer(NULL) {
     setAttribute(Qt::WA_PaintOnScreen);
     setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground);