[Traverso-commit] traverso/src commands/plugins/TraversoCommands/...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/05 22:55:37

Modified files:
        src/commands/plugins/TraversoCommands: TraversoCommands.cpp 
        src/traverso/songcanvas: TrackPanelView.cpp TrackPanelView.h 
                                 ViewItem.h 

Log message:
        fixed no working of song/clip gain after adding gain support to 
trackpanel gain slider :)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.cpp?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackPanelView.cpp?cvsroot=traverso&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackPanelView.h?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/ViewItem.h?cvsroot=traverso&r1=1.12&r2=1.13

Patches:
Index: commands/plugins/TraversoCommands/TraversoCommands.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- commands/plugins/TraversoCommands/TraversoCommands.cpp      5 Apr 2007 
12:18:12 -0000       1.4
+++ commands/plugins/TraversoCommands/TraversoCommands.cpp      5 Apr 2007 
22:55:37 -0000       1.5
@@ -55,17 +55,13 @@
        switch (m_dict.value(command)) {
                case GainCommand:
                {
-                       Track* track = qobject_cast<Track*>(obj);
-                       if (!track) {
-                               TrackPanelGain* tpg = 
qobject_cast<TrackPanelGain*>(obj);
-                               if (! tpg ) {
-                                       PERROR("TraversoCommands: Supplied 
QObject was not aContextItem, "
+                       ContextItem* item = qobject_cast<ContextItem*>(obj);
+                       if (!item) {
+                               PERROR("TraversoCommands: Supplied QObject was 
not a ContextItem, "
                                                "GainCommand only works with 
ContextItem objects!!");
                                        return 0;
                                }
-                               track = (Track*)(tpg->get_context());
-                       }
-                       return new Gain(track, arguments);
+                       return new Gain(item, arguments);
                }
                
                case TrackPanCommand:

Index: traverso/songcanvas/TrackPanelView.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/songcanvas/TrackPanelView.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- traverso/songcanvas/TrackPanelView.cpp      5 Apr 2007 12:18:12 -0000       
1.17
+++ traverso/songcanvas/TrackPanelView.cpp      5 Apr 2007 22:55:37 -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: TrackPanelView.cpp,v 1.17 2007/04/05 12:18:12 r_sijrier Exp $
+$Id: TrackPanelView.cpp,v 1.18 2007/04/05 22:55:37 r_sijrier Exp $
 */
 
 #include <QGraphicsScene>
@@ -299,6 +299,11 @@
        return 0;
 }
 
+Command* TrackPanelGain::gain()
+{
+       return new Gain(m_track, QVariantList());
+}
+
 
 TrackPanelPan::TrackPanelPan(TrackPanelView* parent, Track * track)
        : ViewItem(parent, track)

Index: traverso/songcanvas/TrackPanelView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TrackPanelView.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- traverso/songcanvas/TrackPanelView.h        5 Apr 2007 12:18:12 -0000       
1.8
+++ traverso/songcanvas/TrackPanelView.h        5 Apr 2007 22:55:37 -0000       
1.9
@@ -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: TrackPanelView.h,v 1.8 2007/04/05 12:18:12 r_sijrier Exp $
+$Id: TrackPanelView.h,v 1.9 2007/04/05 22:55:37 r_sijrier Exp $
 */
 
 #ifndef TRACK_PANEL_VIEW_H
@@ -46,6 +46,7 @@
 public slots:
        Command* gain_increment();
        Command* gain_decrement();
+       Command* gain();
 
        
 private:

Index: traverso/songcanvas/ViewItem.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/ViewItem.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- traverso/songcanvas/ViewItem.h      2 Apr 2007 09:52:31 -0000       1.12
+++ traverso/songcanvas/ViewItem.h      5 Apr 2007 22:55:37 -0000       1.13
@@ -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.12 2007/04/02 09:52:31 r_sijrier Exp $
+$Id: ViewItem.h,v 1.13 2007/04/05 22:55:37 r_sijrier Exp $
 */
 
 #ifndef VIEW_ITEM_H
@@ -35,8 +35,13 @@
 // Canvas width should be 2^31, but it doesn't work ok
 // 2^30 works ok, so let's use that, still gives a lot 
 // of headroom for real large recordings
+#if ! defined (Q_WS_WIN)
 #define MAX_CANVAS_WIDTH 1073741824
 #define MAX_CANVAS_HEIGHT 1073741824
+#else          
+#define MAX_CANVAS_WIDTH 107374182
+#define MAX_CANVAS_HEIGHT 107374182
+#endif
                
 class ViewItem : public ContextItem, public QGraphicsItem
 {