From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Tue, 6 Mar 2012 12:53:31 +0000 (+0100)
Subject: Continue merging of scopemanager from Granjow
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b4fed78d531ebfe19f26d8fb3512690328b4a1a3;p=kdenlive

Continue merging of scopemanager from Granjow
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6b3197b8..590854be 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -78,10 +78,8 @@ macro_log_feature(QJSON_FOUND
 )
 
 
-add_subdirectory(audioscopes)
 add_subdirectory(beziercurve)
 add_subdirectory(colorcorrection)
-add_subdirectory(colorscopes)
 add_subdirectory(commands)
 add_subdirectory(projecttree)
 add_subdirectory(utils)
@@ -89,6 +87,7 @@ add_subdirectory(databackup)
 add_subdirectory(kiss_fft)
 add_subdirectory(mimetypes)
 add_subdirectory(onmonitoritems)
+add_subdirectory(scopes)
 add_subdirectory(simplekeyframes)
 add_subdirectory(stopmotion)
 
@@ -113,9 +112,7 @@ list(APPEND kdenlive_SRCS
   abstractclipitem.cpp
   abstractgroupitem.cpp
   abstractmonitor.cpp
-  abstractscopewidget.cpp
   archivewidget.cpp
-  audiosignal.cpp
   choosecolorwidget.cpp
   clipdurationdialog.cpp
   clipitem.cpp
diff --git a/src/abstractscopewidget.cpp b/src/scopes/abstractscopewidget.cpp
similarity index 100%
rename from src/abstractscopewidget.cpp
rename to src/scopes/abstractscopewidget.cpp
diff --git a/src/abstractscopewidget.h b/src/scopes/abstractscopewidget.h
similarity index 100%
rename from src/abstractscopewidget.h
rename to src/scopes/abstractscopewidget.h
diff --git a/src/scopes/audioscopes/CMakeLists.txt b/src/scopes/audioscopes/CMakeLists.txt
index 7b8ef2bd..ab18a4f7 100644
--- a/src/scopes/audioscopes/CMakeLists.txt
+++ b/src/scopes/audioscopes/CMakeLists.txt
@@ -1,8 +1,10 @@
 set(kdenlive_SRCS
   ${kdenlive_SRCS}
-  audioscopes/abstractaudioscopewidget.cpp
-  audioscopes/audiospectrum.cpp
-  audioscopes/ffttools.cpp
-  audioscopes/spectrogram.cpp
+  scopes/audioscopes/abstractaudioscopewidget.cpp
+  scopes/audioscopes/audiosignal.cpp
+  scopes/audioscopes/audiospectrum.cpp
+  scopes/audioscopes/ffttools.cpp
+  scopes/audioscopes/spectrogram.cpp
   PARENT_SCOPE
 )
+
diff --git a/src/audiosignal.cpp b/src/scopes/audioscopes/audiosignal.cpp
similarity index 100%
rename from src/audiosignal.cpp
rename to src/scopes/audioscopes/audiosignal.cpp
diff --git a/src/audiosignal.h b/src/scopes/audioscopes/audiosignal.h
similarity index 100%
rename from src/audiosignal.h
rename to src/scopes/audioscopes/audiosignal.h
diff --git a/src/scopes/colorscopes/CMakeLists.txt b/src/scopes/colorscopes/CMakeLists.txt
index d2df8d08..61624b3c 100644
--- a/src/scopes/colorscopes/CMakeLists.txt
+++ b/src/scopes/colorscopes/CMakeLists.txt
@@ -1,9 +1,9 @@
 set(kdenlive_SRCS
   ${kdenlive_SRCS}
-  colorscopes/abstractgfxscopewidget.cpp
-  colorscopes/histogram.cpp
-  colorscopes/rgbparade.cpp
-  colorscopes/vectorscope.cpp
-  colorscopes/waveform.cpp
+  scopes/colorscopes/abstractgfxscopewidget.cpp
+  scopes/colorscopes/histogram.cpp
+  scopes/colorscopes/rgbparade.cpp
+  scopes/colorscopes/vectorscope.cpp
+  scopes/colorscopes/waveform.cpp
   PARENT_SCOPE
 )