From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Mon, 19 Mar 2012 13:05:53 +0000 (+0100)
Subject: Merge branch 'master' into effectstack
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a1f0a54b93ab364a37fd8242c1881c61d066ada7;p=kdenlive

Merge branch 'master' into effectstack

Conflicts:
	src/CMakeLists.txt
---

a1f0a54b93ab364a37fd8242c1881c61d066ada7
diff --cc src/CMakeLists.txt
index 843beac7,6b03136e..fdbd92b4
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -69,17 -69,16 +69,17 @@@ macro_log_feature(QJSON_FOUN
    "http://qjson.sourceforge.net"
    FALSE
    ""
-   "Required to build the rotoscoping filter"
+   "Required to build the rotoscoping filter and for Freesound.org queries"
  )
  
- add_subdirectory(audioscopes)
+ 
  add_subdirectory(beziercurve)
- add_subdirectory(blackmagic)
  add_subdirectory(colorcorrection)
- add_subdirectory(colorscopes)
  add_subdirectory(commands)
+ add_subdirectory(projecttree)
+ add_subdirectory(utils)
  add_subdirectory(databackup)
 +add_subdirectory(effectstack)
  add_subdirectory(kiss_fft)
  add_subdirectory(mimetypes)
  add_subdirectory(onmonitoritems)
@@@ -196,7 -195,7 +196,8 @@@ kde4_add_ui_files(kdenlive_UI
    widgets/clipdurationdialog_ui.ui
    widgets/clipproperties_ui.ui
    widgets/cliptranscode_ui.ui
 +  widgets/collapsiblewidget_ui.ui
+   widgets/clipstabilize_ui.ui
    widgets/colorclip_ui.ui
    widgets/colorplaneexport_ui.ui
    widgets/configcapture_ui.ui
@@@ -213,7 -212,7 +214,8 @@@
    widgets/dvdwizardvob_ui.ui
    widgets/effectlist_ui.ui
    widgets/effectstack_ui.ui
 +  widgets/effectstack2_ui.ui
+   widgets/freesound_ui.ui
    widgets/geometryval_ui.ui
    widgets/geometrywidget_ui.ui
    widgets/histogram_ui.ui
diff --cc src/mainwindow.cpp
index 53c880a1,9baff750..7745ada7
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@@ -254,9 -267,10 +268,10 @@@ MainWindow::MainWindow(const QString &M
  
      m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this);
      m_effectStackDock->setObjectName("effect_stack");
 -    m_effectStack = new EffectStackView(m_projectMonitor);
 +    m_effectStack = new EffectStackView2(m_projectMonitor);
      m_effectStackDock->setWidget(m_effectStack);
      addDockWidget(Qt::TopDockWidgetArea, m_effectStackDock);
+     connect(m_effectStack, SIGNAL(startFilterJob(ItemInfo, const QString&,const QString&,const QString&,const QString&,const QString&,const QString&,const QString&)), m_projectList, SLOT(slotStartFilterJob(ItemInfo, const QString&,const QString&,const QString&,const QString&,const QString&,const QString&,const QString&)));
  
      m_transitionConfigDock = new QDockWidget(i18n("Transition"), this);
      m_transitionConfigDock->setObjectName("transition");