[Traverso-commit] traverso/src common/Debugger.cpp common/Debugge...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       09/02/23 20:12:10

Modified files:
        src/common     : Debugger.cpp Debugger.h 
        src/sheetcanvas: CMakeLists.txt TimeLineView.cpp 
        src/traverso   : CMakeLists.txt Interface.cpp Main.cpp Main.h 

Log message:
        * merge various fixes from the debian bts, disable opengl code, but 
leave it there for now

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/common/Debugger.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/common/Debugger.h?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/CMakeLists.txt?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.163&r2=1.164
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Main.cpp?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Main.h?cvsroot=traverso&r1=1.1&r2=1.2

Patches:
Index: common/Debugger.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/common/Debugger.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- common/Debugger.cpp 29 Oct 2007 08:59:14 -0000      1.2
+++ common/Debugger.cpp 23 Feb 2009 20:12:09 -0000      1.3
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
  
-    $Id: Debugger.cpp,v 1.2 2007/10/29 08:59:14 r_sijrier Exp $
+    $Id: Debugger.cpp,v 1.3 2009/02/23 20:12:09 r_sijrier Exp $
 */
 
 #include <stdlib.h>
@@ -266,10 +266,9 @@
 // (c) 1995-2004 MindView, Inc. All Rights Reserved.
 // See source code use permissions stated in the file 'License.txt',
 // distributed with the code package available at www.MindView.net.
-#include <cstdio>
-       #include <cstdlib>
-       #include <cassert>
-       #include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstddef>
 using namespace std;
 #undef new
 

Index: common/Debugger.h
===================================================================
RCS file: /sources/traverso/traverso/src/common/Debugger.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- common/Debugger.h   29 Oct 2007 08:59:14 -0000      1.2
+++ common/Debugger.h   23 Feb 2009 20:12:09 -0000      1.3
@@ -17,13 +17,14 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-    $Id: Debugger.h,v 1.2 2007/10/29 08:59:14 r_sijrier Exp $
+    $Id: Debugger.h,v 1.3 2009/02/23 20:12:09 r_sijrier Exp $
 */
 
 #ifndef TRAVERSO_DEBUGGER_H
 #define TRAVERSO_DEBUGGER_H
 
 #include <QString>
+#include <cstdio>
 
 
 //Debugging Macros

Index: sheetcanvas/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- sheetcanvas/CMakeLists.txt  24 May 2008 17:30:31 -0000      1.2
+++ sheetcanvas/CMakeLists.txt  23 Feb 2009 20:12:09 -0000      1.3
@@ -13,11 +13,11 @@
 ${QT_QTXML_INCLUDE_DIR}
 )
 
-IF(HAVE_OPENGL)
-INCLUDE_DIRECTORIES(
-${QT_QTOPENGL_INCLUDE_DIR}
-)
-ENDIF(HAVE_OPENGL)
+# IF(HAVE_OPENGL)
+# INCLUDE_DIRECTORIES(
+# ${QT_QTOPENGL_INCLUDE_DIR}
+# )
+# ENDIF(HAVE_OPENGL)
 
 SET(TRAVERSO_SONGCANVAS_SOURCES
 AudioClipView.cpp

Index: sheetcanvas/TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/TimeLineView.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- sheetcanvas/TimeLineView.cpp        22 Nov 2008 18:26:33 -0000      1.4
+++ sheetcanvas/TimeLineView.cpp        23 Feb 2009 20:12:09 -0000      1.5
@@ -41,6 +41,7 @@
 #include <CommandGroup.h>
 #include "Information.h"
 #include "InputEngine.h"
+#include <cstdlib>
 
 #include <QFont>
 #include <QDebug>

Index: traverso/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CMakeLists.txt,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- traverso/CMakeLists.txt     21 Feb 2009 14:50:56 -0000      1.21
+++ traverso/CMakeLists.txt     23 Feb 2009 20:12:10 -0000      1.22
@@ -289,11 +289,11 @@
 ENDIF(HAVE_MP3_ENCODING)
 
 
-IF(HAVE_OPENGL)
-       TARGET_LINK_LIBRARIES(traverso
-               ${QT_QTOPENGL_LIBRARY}
-       )
-ENDIF(HAVE_OPENGL)
+# IF(HAVE_OPENGL)
+#      TARGET_LINK_LIBRARIES(traverso
+#              ${QT_QTOPENGL_LIBRARY}
+#      )
+# ENDIF(HAVE_OPENGL)
 
 IF(HAVE_ALSA)
 TARGET_LINK_LIBRARIES(traverso

Index: traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- traverso/Interface.cpp      22 Feb 2009 19:17:46 -0000      1.163
+++ traverso/Interface.cpp      23 Feb 2009 20:12:10 -0000      1.164
@@ -1114,11 +1114,11 @@
 
 void Interface::config_changed()
 {
-       bool toggled = config().get_property("Interface", "OpenGL", 
false).toBool();
+/*     bool toggled = config().get_property("Interface", "OpenGL", 
false).toBool();
 
        foreach(SheetWidget* widget, m_sheetWidgets) {
                widget->set_use_opengl(toggled);
-       }
+       }*/
        
        QString encoding = config().get_property("Recording", "FileFormat", 
"wav").toString();
        QList<QAction* > actions = m_encodingMenu->actions();

Index: traverso/Main.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Main.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- traverso/Main.cpp   9 Feb 2009 18:53:12 -0000       1.14
+++ traverso/Main.cpp   23 Feb 2009 20:12:10 -0000      1.15
@@ -1,21 +1,21 @@
 /*
-       Copyright (C) 2005-2006 Remon Sijrier
+Copyright (C) 2005-2009 Remon Sijrier 
 
-       This file is part of Traverso
+This file is part of Traverso
 
-       Traverso is free software; you can redistribute it and/or modify
-       it under the terms of the GNU General Public License as published by
-       the Free Software Foundation; either version 2 of the License, or
-       (at your option) any later version.
-
-       This program is distributed in the hope that it will be useful,
-       but WITHOUT ANY WARRANTY; without even the implied warranty of
-       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-       GNU General Public License for more details.
-
-       You should have received a copy of the GNU General Public License
-       along with this program; if not, write to the Free Software
-       Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  
USA.
+Traverso is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
 */
 
@@ -30,6 +30,7 @@
 #include "Traverso.h"
 #include "Main.h"
 #include "../config.h"
+#include <cstdlib>
 
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!

Index: traverso/Main.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Main.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- traverso/Main.h     20 Apr 2006 14:54:03 -0000      1.1
+++ traverso/Main.h     23 Feb 2009 20:12:10 -0000      1.2
@@ -1,12 +1,23 @@
-/**************************************************************************************
+/*
+Copyright (C) 2005-2009 Remon Sijrier 
 
-        Traverso - THE FREE PROFESSIONAL AUDIO TOOLS FOR LINUX
-        AUTHOR : See AUTHORS file for details
+This file is part of Traverso
 
-        This software is distributed under the terms of the GNU General Public 
License
-        as specified in the COPYING file.
+Traverso is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-***************************************************************************************/
+*/
 
 #ifndef MAIN_H
 #define MAIN_H