[Traverso-commit] traverso/src/sheetcanvas SheetWidget.cpp SheetW...

[Remon Sijrier]

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

Modified files:
        src/sheetcanvas: SheetWidget.cpp SheetWidget.h 

Log message:
        * remove compile time option OpenGL as it doesn't improve anything.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/SheetWidget.cpp?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/SheetWidget.h?cvsroot=traverso&r1=1.1&r2=1.2

Patches:
Index: SheetWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/SheetWidget.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- SheetWidget.cpp     7 Feb 2009 19:32:26 -0000       1.4
+++ SheetWidget.cpp     23 Feb 2009 20:12:58 -0000      1.5
@@ -33,9 +33,9 @@
 #include "ContextPointer.h"
 #include "Mixer.h"
 
-#if defined (QT_OPENGL_SUPPORT)
-#include <QtOpenGL>
-#endif
+// #if defined (QT_OPENGL_SUPPORT)
+// #include <QtOpenGL>
+// #endif
 
 #include <QGridLayout>
 #include <QScrollBar>
@@ -232,8 +232,8 @@
        
        connect(themer(), SIGNAL(themeLoaded()), this, SLOT(load_theme_data()), 
Qt::QueuedConnection);
        
-       m_usingOpenGL  = false;
-       set_use_opengl(config().get_property("Interface", "OpenGL", 
false).toBool());
+//     m_usingOpenGL  = false;
+//     set_use_opengl(config().get_property("Interface", "OpenGL", 
false).toBool());
 
        setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
 
@@ -263,20 +263,20 @@
        return QSize(700, 600);
 }
 
-void SheetWidget::set_use_opengl( bool useOpenGL )
-{
-       if (!m_sheet) {
-               return;
-       }
-       
-       if (useOpenGL != m_usingOpenGL) {
-#if defined (QT_OPENGL_SUPPORT)
-               m_clipsViewPort->setViewport(useOpenGL ? new 
QGLWidget(QGLFormat(QGL::SampleBuffers)) : new QWidget);
-               m_trackPanel->setViewport(useOpenGL ? new 
QGLWidget(QGLFormat(QGL::SampleBuffers)) : new QWidget);
-#endif
-       }
-       m_usingOpenGL = useOpenGL;
-}
+// void SheetWidget::set_use_opengl( bool useOpenGL )
+// {
+//     if (!m_sheet) {
+//             return;
+//     }
+//     
+//     if (useOpenGL != m_usingOpenGL) {
+// #if defined (QT_OPENGL_SUPPORT)
+//             m_clipsViewPort->setViewport(useOpenGL ? new 
QGLWidget(QGLFormat(QGL::SampleBuffers)) : new QWidget);
+//             m_trackPanel->setViewport(useOpenGL ? new 
QGLWidget(QGLFormat(QGL::SampleBuffers)) : new QWidget);
+// #endif
+//     }
+//     m_usingOpenGL = useOpenGL;
+// }
 
 
 void SheetWidget::load_theme_data()

Index: SheetWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/SheetWidget.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SheetWidget.h       21 Jan 2008 16:17:30 -0000      1.1
+++ SheetWidget.h       23 Feb 2009 20:12:58 -0000      1.2
@@ -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: SheetWidget.h,v 1.1 2008/01/21 16:17:30 r_sijrier Exp $
+    $Id: SheetWidget.h,v 1.2 2009/02/23 20:12:58 r_sijrier Exp $
 */
 
 #ifndef SONG_WIDGET_H
@@ -81,7 +81,7 @@
        SheetWidget(Sheet* sheet, QWidget* parent=0);
        ~SheetWidget();
        
-       void set_use_opengl(bool useOpenGL);
+//     void set_use_opengl(bool useOpenGL);
        Sheet* get_sheet() const;
        SheetView* get_sheetview() const;
        
@@ -100,7 +100,7 @@
        QGraphicsScene*         m_scene;
        QScrollBar*             m_vScrollBar;
        QScrollBar*             m_hScrollBar;
-       bool                    m_usingOpenGL;
+//     bool                    m_usingOpenGL;
        
        friend class SheetView;