From 98fc05e1898fecf9e9726b7ef1af08bf6ca0da0c Mon Sep 17 00:00:00 2001 From: Paul Giblock Date: Fri, 22 Feb 2008 08:33:52 +0000 Subject: [PATCH] steroEnhancer, Vibed, and separated Graph widget git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms-mv@700 0778d3d1-df1d-0410-868b-ea421aaaa00d --- plugins/vibed/vibed.cpp | 17 +++++++++-------- plugins/vibed/vibed.h | 2 -- src/widgets/graph.cpp | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp index 8d2667ab3..bea57d872 100644 --- a/plugins/vibed/vibed.cpp +++ b/plugins/vibed/vibed.cpp @@ -41,6 +41,7 @@ #include "templates.h" #include "volume.h" #include "volume_knob.h" +#include "song.h" #undef SINGLE_SOURCE_COMPILE #include "embed.cpp" @@ -690,31 +691,31 @@ void vibedView::showString( Uint8 _string ) void vibedView::sinWaveClicked( void ) { m_graph->model()->setWaveToSine(); - engine::getSongEditor()->setModified(); + engine::getSong()->setModified(); } void vibedView::triangleWaveClicked( void ) { m_graph->model()->setWaveToTriangle(); - engine::getSongEditor()->setModified(); + engine::getSong()->setModified(); } void vibedView::sawWaveClicked( void ) { m_graph->model()->setWaveToSaw(); - engine::getSongEditor()->setModified(); + engine::getSong()->setModified(); } void vibedView::sqrWaveClicked( void ) { m_graph->model()->setWaveToSquare(); - engine::getSongEditor()->setModified(); + engine::getSong()->setModified(); } void vibedView::noiseWaveClicked( void ) { m_graph->model()->setWaveToNoise(); - engine::getSongEditor()->setModified(); + engine::getSong()->setModified(); } void vibedView::usrWaveClicked( void ) @@ -727,13 +728,13 @@ void vibedView::usrWaveClicked( void ) void vibedView::smoothClicked( void ) { m_graph->model()->smooth(); - engine::getSongEditor()->setModified(); + engine::getSong()->setModified(); } void vibedView::normalizeClicked( void ) { m_graph->model()->normalize(); - engine::getSongEditor()->setModified(); + engine::getSong()->setModified(); } @@ -741,7 +742,7 @@ void vibedView::normalizeClicked( void ) void vibedView::contextMenuEvent( QContextMenuEvent * ) { - captionMenu contextMenu( publicName() ); + captionMenu contextMenu( model()->publicName() ); contextMenu.addAction( embed::getIconPixmap( "help" ), tr( "&Help" ), this, SLOT( displayHelp() ) ); contextMenu.exec( QCursor::pos() ); diff --git a/plugins/vibed/vibed.h b/plugins/vibed/vibed.h index 6423384be..12f915b39 100644 --- a/plugins/vibed/vibed.h +++ b/plugins/vibed/vibed.h @@ -30,8 +30,6 @@ #include "knob.h" #include "pixmap_button.h" #include "led_checkbox.h" -#include "impulse_editor.h" -#include "lcd_spinbox.h" #include "volume_knob.h" #include "nine_button_selector.h" diff --git a/src/widgets/graph.cpp b/src/widgets/graph.cpp index eb44ad10c..8b55215c8 100644 --- a/src/widgets/graph.cpp +++ b/src/widgets/graph.cpp @@ -116,7 +116,7 @@ void graph::mouseMoveEvent ( QMouseEvent * _me ) if( diff >= 1 ) { - x = min( width() - 3, m_lastCursorX + 1); + x = min( width() - 2, m_lastCursorX + 1); } else if( diff <= 1 ) {