[Traverso-commit] traverso src/traverso/CorrelationMeterWidget.cp...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       08/01/11 15:37:53

Modified files:
        src/traverso   : CorrelationMeterWidget.cpp 
                         SpectralMeterWidget.cpp 
        src/traverso/songcanvas: ClipsViewPort.cpp SongWidget.cpp 
                                 TimeLineViewPort.cpp 
                                 TrackPanelViewPort.cpp ViewItem.h 
        .              : TODO cleancompile 

Log message:
        * check if QGraphicsItem is a ViewItem before adding it to the list of 
context items

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CorrelationMeterWidget.cpp?cvsroot=traverso&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/SpectralMeterWidget.cpp?cvsroot=traverso&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/ClipsViewPort.cpp?cvsroot=traverso&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongWidget.cpp?cvsroot=traverso&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineViewPort.cpp?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackPanelViewPort.cpp?cvsroot=traverso&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/ViewItem.h?cvsroot=traverso&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/traverso/TODO?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/cleancompile?cvsroot=traverso&r1=1.7&r2=1.8

Patches:
Index: src/traverso/CorrelationMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CorrelationMeterWidget.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/traverso/CorrelationMeterWidget.cpp     23 Nov 2007 16:23:28 -0000      
1.27
+++ src/traverso/CorrelationMeterWidget.cpp     11 Jan 2008 15:37:52 -0000      
1.28
@@ -95,8 +95,10 @@
        printf("CorrelationMeterWidget::get_pointed_view_items\n");
        QList<QGraphicsItem *> itemlist = 
items(cpointer().on_first_input_event_x(), cpointer().on_first_input_event_y());
        foreach(QGraphicsItem* item, itemlist) {
+               if (item->type() == ViewItem::Type) {
                list.append((ViewItem*)item);
        }
+       }
        
        printf("itemlist size is %d\n", itemlist.size());
 }

Index: src/traverso/SpectralMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/SpectralMeterWidget.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- src/traverso/SpectralMeterWidget.cpp        23 Nov 2007 16:23:28 -0000      
1.46
+++ src/traverso/SpectralMeterWidget.cpp        11 Jan 2008 15:37:52 -0000      
1.47
@@ -98,8 +98,10 @@
 {
        QList<QGraphicsItem *> itemlist = 
items(cpointer().on_first_input_event_x(), cpointer().on_first_input_event_y());
        foreach(QGraphicsItem* item, itemlist) {
+               if (item->type() == ViewItem::Type) {
                list.append((ViewItem*)item);
        }
+       }
 }
 
 SpectralMeterView * SpectralMeterWidget::get_item()

Index: src/traverso/songcanvas/ClipsViewPort.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/ClipsViewPort.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/traverso/songcanvas/ClipsViewPort.cpp   5 Nov 2007 15:49:31 -0000       
1.28
+++ src/traverso/songcanvas/ClipsViewPort.cpp   11 Jan 2008 15:37:52 -0000      
1.29
@@ -24,6 +24,7 @@
 #include "SongWidget.h"
 #include "SongView.h"
 #include "TrackView.h"
+#include "ViewItem.h"
 #include <libtraversocore.h>
 #include <Import.h>
 #include <CommandGroup.h>
@@ -56,8 +57,10 @@
 {
        QList<QGraphicsItem *> itemlist = 
items(cpointer().on_first_input_event_x(), cpointer().on_first_input_event_y());
        foreach(QGraphicsItem* item, itemlist) {
+               if (item->type() == ViewItem::Type) {
                list.append((ViewItem*)item);
        }
+       }
        list.append(m_sw->get_songview());
 }
 

Index: src/traverso/songcanvas/SongWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongWidget.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- src/traverso/songcanvas/SongWidget.cpp      3 Dec 2007 14:05:25 -0000       
1.23
+++ src/traverso/songcanvas/SongWidget.cpp      11 Jan 2008 15:37:52 -0000      
1.24
@@ -141,8 +141,10 @@
        {
                QList<QGraphicsItem *> itemlist = 
items(cpointer().on_first_input_event_x(), cpointer().on_first_input_event_y());
                foreach(QGraphicsItem* item, itemlist) {
+                       if (item->type() == ViewItem::Type) {
                        list.append((ViewItem*)item);
                }
+               }
                list.removeAll(m_spv);
                list.append(m_sv);
        }

Index: src/traverso/songcanvas/TimeLineViewPort.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/songcanvas/TimeLineViewPort.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/traverso/songcanvas/TimeLineViewPort.cpp        25 May 2007 08:37:55 
-0000      1.9
+++ src/traverso/songcanvas/TimeLineViewPort.cpp        11 Jan 2008 15:37:52 
-0000      1.10
@@ -60,8 +60,10 @@
 {
        QList<QGraphicsItem *> itemlist = 
items(cpointer().on_first_input_event_x(), cpointer().on_first_input_event_y());
        foreach(QGraphicsItem* item, itemlist) {
+               if (item->type() == ViewItem::Type) {
                list.append((ViewItem*)item);
        }
+       }
        list.append(m_sv);
 }
 

Index: src/traverso/songcanvas/TrackPanelViewPort.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/songcanvas/TrackPanelViewPort.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/traverso/songcanvas/TrackPanelViewPort.cpp      17 Oct 2007 14:46:18 
-0000      1.11
+++ src/traverso/songcanvas/TrackPanelViewPort.cpp      11 Jan 2008 15:37:52 
-0000      1.12
@@ -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: TrackPanelViewPort.cpp,v 1.11 2007/10/17 14:46:18 r_sijrier Exp $
+    $Id: TrackPanelViewPort.cpp,v 1.12 2008/01/11 15:37:52 r_sijrier Exp $
 */
 
 #include "TrackPanelViewPort.h"
@@ -45,8 +45,10 @@
 {
        QList<QGraphicsItem *> itemlist = 
items(cpointer().on_first_input_event_x(), cpointer().on_first_input_event_y());
        foreach(QGraphicsItem* item, itemlist) {
+               if (item->type() == ViewItem::Type) {
                list.append((ViewItem*)item);
        }
+       }
        list.append(m_sw->get_songview());
 }
 

Index: src/traverso/songcanvas/ViewItem.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/ViewItem.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/traverso/songcanvas/ViewItem.h  5 Nov 2007 15:49:32 -0000       1.17
+++ src/traverso/songcanvas/ViewItem.h  11 Jan 2008 15:37:52 -0000      1.18
@@ -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: ViewItem.h,v 1.17 2007/11/05 15:49:32 r_sijrier Exp $
+$Id: ViewItem.h,v 1.18 2008/01/11 15:37:52 r_sijrier Exp $
 */
 
 #ifndef VIEW_ITEM_H
@@ -61,7 +61,10 @@
        QRectF boundingRect() const;
        virtual void calculate_bounding_rect() {
                for (int i=0; i< QGraphicsItem::children().size(); ++i) {
-               
((ViewItem*)QGraphicsItem::children().at(i))->calculate_bounding_rect();
+                       QGraphicsItem* item = QGraphicsItem::children().at(i);
+                       if (item->type() == Type) {
+                               ((ViewItem*)item)->calculate_bounding_rect();
+                       }
                }
        }
        void prepare_geometry_change() {prepareGeometryChange();}

Index: TODO
===================================================================
RCS file: /sources/traverso/traverso/TODO,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- TODO        18 Dec 2007 18:09:00 -0000      1.19
+++ TODO        11 Jan 2008 15:37:52 -0000      1.20
@@ -1,6 +1,24 @@
 TOBEDONE FOR 0.4x.x
 
-
+* Found out if locale encodings work for special chars (like ë) when 
importing an 
+  audio (wav) file and creating peak files on all platforms.
+* Track (Vynil) plugin also applied to other tracks ??
+* jack in/output ports numbers are calculated in reversed order! so inputcount 
ports is output count and vise versa
+* art-deco bug with polygon based painting still there!
+* unable to select hidden dir for theme path.
+* crash when clicking on button next to theme path (Appearance page)
+* ubuntu-theme: no audoclip outline color set?
+* Unable to lock memory, Traverso runs unstable due that. Detect (parse 
limits.conf file) first before trying to memlock ?
+* ubuntu and system-pallete theme don't have transparent clip backgrounds.
+* xvidcap -> for creating video demos
+* when you right-click on an area with multiple clips overlapping, you get a 
menu with multiple clips.  Maybe each clip needs to have a "bring to front" 
function
+* new Song::get_last_location() semantics might not work well e.g. in 
MoveClip, TimeLineView.
+* Why does the User Manual say I need libflac++?
+* 2tracks project, seeking to start when beyond first clip: mp3 output garbled!
+* solution for project dir renamed outside of traverso: disabling write bit ?
+* On first start, Traverso no longer asks to select project dir.
+* Oh, one usability thing... You might want to make the import audio dialog 
automatically select the "Support Audio File" filter instead of "All Files"
+* Add cmake flags to disable autodetect of platform, and compile platform 
specific (x86 (i686), vs x86_64)
 * http://traverso-daw.org/forum/index.php/topic,77.msg264.html#msg264
 
 * check if permissions in /etc/security/limits.conf are set, and if not, 
notify the user!

Index: cleancompile
===================================================================
RCS file: /sources/traverso/traverso/cleancompile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- cleancompile        2 Apr 2007 19:23:06 -0000       1.7
+++ cleancompile        11 Jan 2008 15:37:52 -0000      1.8
@@ -12,5 +12,5 @@
        find ./ -name Makefile -type f -print0 | xargs -0 /bin/rm -f
 fi
 
-qmake -nocache
+qmake -nocache  QMAKE_CXX=apg++ QMAKE_CC=apgcc
 time make -j2