hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

piano roll fix and configure flags

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@427 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Javier Serrano Polo
2006-11-11 22:42:59 +00:00
parent ba20593377
commit 2a4867e0f9
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2006-11-11 Javier Serrano Polo <jasp00/at/terra/dot/es>
* src/core/piano_roll.cpp:
fixed pasting recorded notes segfault
* configure.in:
turned EXTRAFLAGS into DEFAULTFLAGS
2006-11-11 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/flp_import/flp_import.cpp:

18
configure.in
View File

@@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT(lmms, 0.2.1-svn20061108, lmms-devel/at/lists/dot/sf/dot/net)
AM_INIT_AUTOMAKE(lmms, 0.2.1-svn20061108)
AC_INIT(lmms, 0.2.1-svn20061111, lmms-devel/at/lists/dot/sf/dot/net)
AM_INIT_AUTOMAKE(lmms, 0.2.1-svn20061111)
AM_CONFIG_HEADER(config.h)
@@ -51,19 +51,19 @@ AM_CONDITIONAL(BUILD_LINUX, test "$build_linux" = "true")
# -fomit-frame-pointer crashes wine on Ubuntu Dapper--Danny 7/21/06
#EXTRAFLAGS="-floop-optimize2 -fomit-frame-pointer -fgcse-sm -fgcse-las"
EXTRAFLAGS="-O2 -g0" #"-floop-optimize2 -fgcse-sm -fgcse-las"
#DEFAULTFLAGS="-floop-optimize2 -fomit-frame-pointer -fgcse-sm -fgcse-las"
DEFAULTFLAGS="-O2 -g0" #"-floop-optimize2 -fgcse-sm -fgcse-las"
# Tested with GCC 4.0--needs to be tested with 4.1--Danny 7/21/06
if test "x`$CC --version|head -1|cut -d\ -f3|cut -d. -f1`" = "x4" ; then
EXTRAFLAGS="$EXTRAFLAGS -ftree-vectorize -ftree-loop-linear"
DEFAULTFLAGS="$DEFAULTFLAGS -ftree-vectorize -ftree-loop-linear"
if test "x`$CC --version|head -1|cut -d\ -f3|cut -d. -f2`" != "x0" ; then
EXTRAFLAGS="$EXTRAFLAGS -funsafe-loop-optimizations -Wunsafe-loop-optimizations"
DEFAULTFLAGS="$DEFAULTFLAGS -funsafe-loop-optimizations -Wunsafe-loop-optimizations"
fi
fi
CFLAGS="$CFLAGS $EXTRAFLAGS"
CXXFLAGS="$CXXFLAGS $EXTRAFLAGS"
CFLAGS="$DEFAULTFLAGS $CFLAGS"
CXXFLAGS="$DEFAULTFLAGS $CXXFLAGS"
AC_PATH_XTRA
gw_CHECK_QT
@@ -215,7 +215,7 @@ if test "x$with_vst" = "xyes" ; then
ORIG_CFLAGS=$CFLAGS
ORIG_CPPFLAGS=$CPPFLAGS
CFLAGS="$CLFAGS -I./include"
CFLAGS="$CFLAGS -I./include"
CPPFLAGS="$CPPFLAGS -I./include"
ORIG_CC="$CC"
CC="$CXX"

7
src/core/piano_roll.cpp
View File

@@ -2230,9 +2230,10 @@ void pianoRoll::recordNote( const note & _n )
{
if( m_recording == TRUE && validPattern() == TRUE )
{
note n( _n );
n.setPos( eng()->getSongEditor()->getPlayPos(
songEditor::PLAY_PATTERN ) - n.length() );
note n( eng(), _n.length(), eng()->getSongEditor()->getPlayPos(
songEditor::PLAY_PATTERN ) - _n.length(),
_n.tone(), _n.octave(),
_n.getVolume(), _n.getPanning() );
n.quantizeLength( quantization() );
#ifndef QT4
qApp->lock();