[Traverso-commit] traverso/src/sheetcanvas AudioClipView.cpp Audi...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       09/03/06 10:06:36

Modified files:
        src/sheetcanvas: AudioClipView.cpp AudioClipView.h ViewItem.h 

Log message:
        * cleanup unused vars/functions

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/AudioClipView.h?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/ViewItem.h?cvsroot=traverso&r1=1.1&r2=1.2

Patches:
Index: AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/AudioClipView.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- AudioClipView.cpp   25 Feb 2009 18:00:58 -0000      1.22
+++ AudioClipView.cpp   6 Mar 2009 10:06:35 -0000       1.23
@@ -765,17 +765,17 @@
        QFont font = themer()->get_font("AudioClip:fontscale:title");
        QFontMetrics fm(font);
        
-       m_clipinfoString = fm.elidedText(m_clip->get_name(), Qt::ElideMiddle, 
150) 
+       QString clipinfoString = fm.elidedText(m_clip->get_name(), 
Qt::ElideMiddle, 150) 
                           + "    " + sclipGain + "   " + 
QString::number(m_clip->get_rate()) +  " Hz";
        
-       int clipInfoWidth = fm.boundingRect(m_clipinfoString).width();
+       int clipInfoWidth = fm.boundingRect(clipinfoString).width();
        
        m_clipInfo = QPixmap(clipInfoWidth, m_infoAreaHeight);
        m_clipInfo.fill(Qt::transparent);
        
        QPainter painter(&m_clipInfo);
        painter.setFont(font);
-       painter.drawText(m_clipInfo.rect(), m_clipinfoString);
+       painter.drawText(m_clipInfo.rect(), clipinfoString);
 }
 
 void AudioClipView::update_progress_info( int progress )
@@ -906,7 +906,6 @@
 {
        m_drawbackground = themer()->get_property("AudioClip:drawbackground", 
1).toInt();
        m_infoAreaHeight = themer()->get_property("AudioClip:infoareaheight", 
16).toInt();
-       m_usePolygonPeakDrawing = 
themer()->get_property("AudioClip:polygonpeakdrawing", 0).toInt();
        m_mimimumheightforinfoarea = 
themer()->get_property("AudioClip:mimimumheightforinfoarea", 45).toInt();
        m_classicView = ! config().get_property("Themer", 
"paintaudiorectified", false).toBool();
        m_mergedView = config().get_property("Themer", 
"paintstereoaudioasmono", false).toBool();

Index: AudioClipView.h
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/AudioClipView.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- AudioClipView.h     24 Feb 2009 21:28:57 -0000      1.8
+++ AudioClipView.h     6 Mar 2009 10:06:35 -0000       1.9
@@ -90,7 +90,6 @@
        int m_height;
        int m_infoAreaHeight;
        int m_mimimumheightforinfoarea;
-       int m_usePolygonPeakDrawing;
        int m_lineOffset;
        int m_lineVOffset;
        TimeRef m_oldRecordingPos;
@@ -117,8 +116,6 @@
        QBrush m_brushFgEdit;
        QBrush m_brushFgEditHover;
 
-       QString m_clipinfoString;
-
        void create_clipinfo_string();
 
        void draw_clipinfo_area(QPainter* painter, int xstart, int pixelcount);

Index: ViewItem.h
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/ViewItem.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ViewItem.h  21 Jan 2008 16:17:31 -0000      1.1
+++ ViewItem.h  6 Mar 2009 10:06:36 -0000       1.2
@@ -66,7 +66,6 @@
                        }
                }
        }
-       void prepare_geometry_change() {prepareGeometryChange();}
        virtual int get_childview_y_offset() const {return 0;}
        virtual int type() const;
        virtual int get_height() const {return (int)m_boundingRect.height();}