[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso CMakeLists.txt src/commands/Zoom.cpp s...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso CMakeLists.txt src/commands/Zoom.cpp s... |
|
Date: |
Mon, 29 Dec 2008 20:43:19 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 08/12/29 20:43:19
Modified files:
. : CMakeLists.txt
src/commands : Zoom.cpp
src/core : Sheet.cpp
Log message:
* revert non-power of 2 zooming as it is currently broken
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Zoom.cpp?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Sheet.cpp?cvsroot=traverso&r1=1.14&r2=1.15
Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/CMakeLists.txt,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- CMakeLists.txt 11 Nov 2008 13:42:37 -0000 1.29
+++ CMakeLists.txt 29 Dec 2008 20:43:19 -0000 1.30
@@ -9,6 +9,12 @@
SET(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
+IF(COMMAND CMAKE_POLICY)
+ CMAKE_POLICY(SET CMP0005 NEW)
+ CMAKE_POLICY(SET CMP0003 NEW)
+ENDIF(COMMAND CMAKE_POLICY)
+
+
#PROJECT SETUP
PROJECT(traverso)
SET (VERSION_MAJOR "0")
@@ -51,6 +57,10 @@
ENDIF (NOT CUSTOM_VERSIONTAG)
ENDIF (WANT_VERSIONING AND NOT CACHED_VERSIONING)
+IF(WIN32)
+SET(WANT_LV2 OFF)
+ENDIF(WIN32)
+
# Static build is perfectly fine now, targets are properly relinked when
needed!
SET(TRAVERSO_DEFINES -DSTATIC_BUILD)
@@ -86,6 +96,7 @@
SET(MINIMAL_FFTW_VERSION 3.0.0)
SET(MINIMAL_REDLAND_VERSION 1.0.2)
SET(MINIMAL_PULSAUDIO_VERSION 0.9)
+SET(HAVE_COREAUDIO FALSE)
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -Wall ${CXX_FLAGS}")
SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wall -fPIC ${CXX_FLAGS}")
@@ -343,21 +354,20 @@
ENDIF(HAVE_MLOCK)
-# Detect if we want native Mac OS X support (CoreAudio)
-# and if we can build with it.
-IF(WANT_COREAUDIO)
- SET(HAVE_COREAUDIO TRUE)
- LIST(APPEND TRAVERSO_DEFINES -DCOREAUDIO_SUPPORT)
-ELSE(WANT_COREAUDIO)
- SET(HAVE_COREAUDIO FALSE)
-ENDIF(WANT_COREAUDIO)
-
IF(UNIX)
#BEGIN Mac OS X section
IF(APPLE)
+ # Detect if we want native Mac OS X support (CoreAudio)
+ # and if we can build with it.
+ IF(WANT_COREAUDIO)
+ SET(HAVE_COREAUDIO TRUE)
+ LIST(APPEND TRAVERSO_DEFINES -DCOREAUDIO_SUPPORT)
+ ELSE(WANT_COREAUDIO)
+ SET(HAVE_COREAUDIO FALSE)
+ ENDIF(WANT_COREAUDIO)
# @ MAC OS X builders, I've NO IDEA what this should be, please have a look at
it
# It should be possible to create a working bundle with CPack using stuff
@@ -488,12 +498,17 @@
${QT_QTMAIN_LIBRARY}
)
LIST (APPEND TRAVERSO_DEFINES -DQT_DLL -DWIN_BUILD
-DPORTAUDIO_SUPPORT)
+ SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wall -fno-strict-aliasing
${CXX_FLAGS}")
+ CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H)
+ INCLUDE_DIRECTORIES(/home/remon/Traverso/cvs/windows/include)
ENDIF(WIN32)
ENDIF(UNIX)
+
+
IF(WANT_THREAD_CHECK)
LIST(APPEND TRAVERSO_DEFINES -DTHREAD_CHECK)
ENDIF(WANT_THREAD_CHECK)
@@ -597,15 +612,15 @@
)
-MESSAGE("")
-MESSAGE("Build options:")
-MESSAGE("Building in mode : ${CMAKE_BUILD_TYPE}")
-MESSAGE("ALSA support : ${HAVE_ALSA}")
-MESSAGE("Jack support : ${HAVE_JACK}")
-MESSAGE("PortAudio support : ${HAVE_PORTAUDIO}")
-MESSAGE("CoreAudio support : ${HAVE_COREAUDIO}")
-MESSAGE("SLV2 support : ${SLV2OPTIONS}")
-MESSAGE("MP3 read support : ${HAVE_MP3_DECODING}")
-MESSAGE("MP3 writing support : ${HAVE_MP3_ENCODING}")
-MESSAGE("OpenGL support : ${HAVE_OPENGL}")
-MESSAGE("")
+MESSAGE("
+Build options:
+Building in mode : ${CMAKE_BUILD_TYPE}
+ALSA support : ${HAVE_ALSA}
+Jack support : ${HAVE_JACK}
+PortAudio support : ${HAVE_PORTAUDIO}
+CoreAudio support : ${HAVE_COREAUDIO}
+SLV2 support : ${SLV2OPTIONS}
+MP3 read support : ${HAVE_MP3_DECODING}
+MP3 writing support : ${HAVE_MP3_ENCODING}
+OpenGL support : ${HAVE_OPENGL}
+")
\ No newline at end of file
Index: src/commands/Zoom.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Zoom.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/commands/Zoom.cpp 21 Jan 2008 16:22:12 -0000 1.16
+++ src/commands/Zoom.cpp 29 Dec 2008 20:43:19 -0000 1.17
@@ -122,13 +122,16 @@
int x = cpointer().x();
int dx = x - horizontalJogZoomLastX;
- if (abs(dx) > 1) {
+ // TODO
+ // values between /* */ are for use when using non power of 2
zoom levels!
+
+ if (abs(dx) > 10 /*1*/) {
horizontalJogZoomLastX = x;
Sheet* sheet = m_sv->get_sheet();
if (dx > 0) {
- sheet->set_hzoom(sheet->get_hzoom() /
(m_xScalefactor + dx/18));
+ sheet->set_hzoom(sheet->get_hzoom() / 2
/*(m_xScalefactor + dx/18)*/);
} else {
- sheet->set_hzoom(sheet->get_hzoom() *
(m_xScalefactor + abs(dx)/18));
+ sheet->set_hzoom(sheet->get_hzoom() * 2
/*(m_xScalefactor + abs(dx)/18)*/);
}
m_sv->center();
}
@@ -145,7 +148,9 @@
m_sv->vzoom(1 + m_yScalefactor);
}
if (m_xScalefactor != 1) {
- m_sv->hzoom(m_xScalefactor);
+ // TODO
+ // values between /* */ are for use when using non power of 2
zoom levels!
+ m_sv->hzoom(0.5 /*m_xScalefactor*/);
// m_sv->center();
}
Index: src/core/Sheet.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Sheet.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/core/Sheet.cpp 7 Nov 2008 10:43:08 -0000 1.14
+++ src/core/Sheet.cpp 29 Dec 2008 20:43:19 -0000 1.15
@@ -168,7 +168,7 @@
set_context_item( m_acmanager );
- m_playBackBus = audiodevice().get_playback_bus("Playback 1");
+ m_playBackBus = audiodevice().get_playback_bus("Playback 2");
m_transport = m_stopTransport = m_resumeTransport = m_readyToRecord =
false;
snaplist = new SnapList(this);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso CMakeLists.txt src/commands/Zoom.cpp s...,
Remon Sijrier <=