From d17b6c53288690cf4b2dd28ad8a1be17245977bc Mon Sep 17 00:00:00 2001 From: Lukas W Date: Thu, 4 Dec 2014 17:16:50 +0100 Subject: [PATCH] LmmsStyle: Remove legacy code --- include/LmmsStyle.h | 5 - src/core/RingBuffer.cpp | 4 +- src/gui/LmmsStyle.cpp | 430 ---------------------------------------- 3 files changed, 2 insertions(+), 437 deletions(-) diff --git a/include/LmmsStyle.h b/include/LmmsStyle.h index 1173a1e1a..a99628f5e 100644 --- a/include/LmmsStyle.h +++ b/include/LmmsStyle.h @@ -69,8 +69,6 @@ public: virtual QPalette standardPalette( void ) const; -// virtual void drawControl( ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget ) const; - virtual void drawComplexControl( ComplexControl control, const QStyleOptionComplex * option, @@ -85,9 +83,6 @@ public: const QStyleOption * option = 0, const QWidget * widget = 0 ) const; -// QSize sizeFromContents( ContentsType type, const QStyleOption* option, const QSize& size, const QWidget* widget ) const; -// QRect subControlRect( ComplexControl control, const QStyleOptionComplex *option, SubControl subControl, const QWidget *widget ) const; - static QPalette * s_palette; private: diff --git a/src/core/RingBuffer.cpp b/src/core/RingBuffer.cpp index 21ec1f70f..ae06acc61 100644 --- a/src/core/RingBuffer.cpp +++ b/src/core/RingBuffer.cpp @@ -56,7 +56,7 @@ RingBuffer::RingBuffer( float size ) : RingBuffer::~RingBuffer() { - delete m_buffer; + delete[] m_buffer; } @@ -308,7 +308,7 @@ void RingBuffer::updateSamplerate() float newsize = static_cast( ( m_size - m_fpp ) * Engine::mixer()->processingSampleRate() ) / m_samplerate; m_size = static_cast( ceilf( newsize ) ) + m_fpp; m_samplerate = Engine::mixer()->processingSampleRate(); - delete m_buffer; + delete[] m_buffer; m_buffer = new sampleFrame[ m_size ]; memset( m_buffer, 0, m_size * sizeof( sampleFrame ) ); m_position = 0; diff --git a/src/gui/LmmsStyle.cpp b/src/gui/LmmsStyle.cpp index 28e47b2c1..893e00684 100644 --- a/src/gui/LmmsStyle.cpp +++ b/src/gui/LmmsStyle.cpp @@ -35,78 +35,6 @@ #include "LmmsStyle.h" #include "LmmsPalette.h" -const int BUTTON_LENGTH = 24; - -static const char * const s_scrollbarArrowUpXpm[] = { - "7 6 8 1", - " g None", - ". g #000000", - "+ g #101010", - "@ g #A0A0A0", - "# g #C0C0C0", - "$ g #FFFFFF", - "% g #808080", - "& g #202020", - "..+@+..", - "..#$#..", - ".%$$$%.", - "&$$$$$&", - "@$$$$$@", - "@#####@"}; - -static const char * const s_scrollbarArrowRightXpm[] = { - "6 7 8 1", - " c None", - ". c #A0A0A0", - "+ c #202020", - "@ c #000000", - "# c #C0C0C0", - "$ c #FFFFFF", - "% c #808080", - "& c #101010", - "..+@@@", - "#$$%@@", - "#$$$#&", - "#$$$$.", - "#$$$#&", - "#$$%@@", - "..+@@@"}; - -static const char * const s_scrollbarArrowDownXpm[] = { - "7 6 8 1", - " g None", - ". g #000000", - "+ g #101010", - "@ g #A0A0A0", - "# g #C0C0C0", - "$ g #FFFFFF", - "% g #808080", - "& g #202020", - "@#####@", - "@$$$$$@", - "&$$$$$&", - ".%$$$%.", - "..#$#..", - "..+@+.."}; - -static const char * const s_scrollbarArrowLeftXpm[] = { - "6 7 8 1", - " g None", - ". g #000000", - "+ g #202020", - "@ g #A0A0A0", - "# g #808080", - "$ g #FFFFFF", - "% g #C0C0C0", - "& g #101010", - "...+@@", - "..#$$%", - "&%$$$%", - "@$$$$%", - "&%$$$%", - "..#$$%", - "...+@@"}; - QPalette * LmmsStyle::s_palette = NULL; QLinearGradient getGradient( const QColor & _col, const QRectF & _rect ) @@ -226,196 +154,6 @@ QPalette LmmsStyle::standardPalette( void ) const } - -/* -void LmmsStyle::drawControl( ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget ) const -{ - - switch( element ) - { - case CE_ScrollBarAddLine: - if( const QStyleOptionSlider * scrollBar = qstyleoption_cast( option ) ) - { - - bool horizontal = scrollBar->orientation == Qt::Horizontal; - bool isEnabled = scrollBar->state & State_Enabled; - bool sunken = scrollBar->state & State_Sunken; - bool hover = scrollBar->state & State_MouseOver; - - QString pixmapName = getCacheKey( QLatin1String( "ScrollBarAddLine" ), option, option->rect.size() ); - - QPixmap cache; - if( !QPixmapCache::find( pixmapName, cache ) ) - { - cache = QPixmap( option->rect.size() ); - QPainter cachePainter( &cache ); - - cache.fill( QColor( 48, 48, 48 ) ); - QColor sliderColor; - QColor blurColor; - hoverColors(sunken, hover, - scrollBar->activeSubControls & SC_ScrollBarAddLine && isEnabled, - sliderColor, blurColor); - - int scrollBarExtent = pixelMetric( PM_ScrollBarExtent, option, widget ); - cachePainter.setPen( QPen( sliderColor, 0 ) ); - if( horizontal ) - { - int r = cache.rect().right(); - cachePainter.fillRect(0, 2, BUTTON_LENGTH-2, - scrollBarExtent-4, sliderColor); - - cachePainter.drawLine( r, 4, r, scrollBarExtent - 5 ); - cachePainter.drawLine( r - 1, 3, r - 1, scrollBarExtent - 4 ); - - const QPointF points[4] = { - QPoint( r, 3 ), QPoint( r, scrollBarExtent - 4 ), - QPoint( r - 1, 2 ), QPoint( r - 1, scrollBarExtent - 3 )}; - - cachePainter.setPen( QPen( blurColor, 0 ) ); - cachePainter.drawPoints( points, 4 ); - - QImage arrow = colorizeXpm( s_scrollbarArrowRightXpm, option->palette.foreground().color() ); - if( ( scrollBar->activeSubControls & SC_ScrollBarAddLine ) && sunken ) - { - cachePainter.translate( 1, 1 ); - } - cachePainter.drawImage( cache.rect().center() - QPoint( 3, 3 ), arrow ); - } - else - { - int b = cache.rect().bottom(); - cachePainter.fillRect( 2, 0, scrollBarExtent - 4, BUTTON_LENGTH - 2, sliderColor ); - cachePainter.drawLine( 4, b, scrollBarExtent - 5, b ); - cachePainter.drawLine( 3, b - 1, scrollBarExtent - 4, b - 1 ); - - const QPointF points[4] = { - QPoint( 3, b ), QPoint( scrollBarExtent - 4, b ), - QPoint( 2, b - 1 ), QPoint( scrollBarExtent - 3, b - 1 )}; - - cachePainter.setPen( QPen( blurColor, 0 ) ); - cachePainter.drawPoints( points, 4 ); - - QImage arrow = colorizeXpm( s_scrollbarArrowDownXpm, option->palette.foreground().color() ); - if( ( scrollBar->activeSubControls & SC_ScrollBarAddLine ) && sunken ) - { - cachePainter.translate( 1, 1 ); - } - cachePainter.drawImage( cache.rect().center() - QPoint( 3, 3 ), arrow ); - } - QPixmapCache::insert( pixmapName, cache ); - } - painter->drawPixmap( option->rect.topLeft(), cache ); - - } - break; - - case CE_ScrollBarSubLine: - if(const QStyleOptionSlider *scrollBar = qstyleoption_cast( option ) ) - { - bool horizontal = scrollBar->orientation == Qt::Horizontal; - bool isEnabled = scrollBar->state & State_Enabled; - bool sunken = scrollBar->state & State_Sunken; - bool hover = scrollBar->state & State_MouseOver; - - QString pixmapName = getCacheKey( QLatin1String( "ScrollBarSubLine" ), option, option->rect.size() ); - QPixmap cache; - if( !QPixmapCache::find( pixmapName, cache ) ) - { - cache = QPixmap( option->rect.size() ); - QPainter cachePainter( &cache ); - - cache.fill( QColor( 48, 48, 48 ) ); // TODO: Fill with CSS background - QColor sliderColor; - QColor blurColor; - hoverColors(sunken, hover, - scrollBar->activeSubControls & SC_ScrollBarSubLine && isEnabled, - sliderColor, blurColor); - - int scrollBarExtent = pixelMetric( PM_ScrollBarExtent, option, widget ); - cachePainter.setPen( QPen( sliderColor, 0 ) ); - if( horizontal ) - { - cachePainter.fillRect( 2, 2, BUTTON_LENGTH - 2, scrollBarExtent - 4, sliderColor ); - cachePainter.drawLine( 0, 4, 0, scrollBarExtent - 5 ); - cachePainter.drawLine( 1, 3, 1, scrollBarExtent - 4 ); - - const QPointF points[4] = { - QPoint( 0, 3 ), QPoint( 0, scrollBarExtent - 4 ), - QPoint( 1, 2 ), QPoint( 1, scrollBarExtent - 3 )}; - - cachePainter.setPen( QPen( blurColor, 0 ) ); - cachePainter.drawPoints( points, 4 ); - - QImage arrow = colorizeXpm( s_scrollbarArrowLeftXpm, option->palette.foreground().color() ); - if( ( scrollBar->activeSubControls & SC_ScrollBarSubLine ) && sunken ) - { - cachePainter.translate( 1, 1 ); - } - cachePainter.drawImage( cache.rect().center() - QPoint( 3, 3 ), arrow ); - } - else - { - cachePainter.fillRect( 2, 2, scrollBarExtent - 4, BUTTON_LENGTH - 2, sliderColor ); - cachePainter.drawLine( 4, 0, scrollBarExtent - 5, 0 ); - cachePainter.drawLine( 3, 1, scrollBarExtent - 4, 1 ); - - const QPointF points[4] = { - QPoint( 3, 0 ), QPoint( scrollBarExtent - 4, 0 ), - QPoint( 2, 1 ), QPoint( scrollBarExtent - 3, 1 )}; - - cachePainter.setPen( QPen( blurColor, 0 ) ); - cachePainter.drawPoints( points, 4 ); - - QImage arrow = colorizeXpm( s_scrollbarArrowUpXpm, option->palette.foreground().color() ); - if( ( scrollBar->activeSubControls & SC_ScrollBarSubLine ) && sunken ) - { - cachePainter.translate( 1, 1 ); - } - cachePainter.drawImage( cache.rect().center() - QPoint( 3, 3 ), arrow ); - } - QPixmapCache::insert( pixmapName, cache ); - } - painter->drawPixmap( option->rect.topLeft(), cache ); - - } - break; - - case CE_ScrollBarSubPage: - case CE_ScrollBarAddPage: - break; - - case CE_ScrollBarSlider: - if( const QStyleOptionSlider* scrollBar = qstyleoption_cast( option ) ) - { - bool horizontal = scrollBar->orientation == Qt::Horizontal; - bool isEnabled = scrollBar->state & State_Enabled; - bool sunken = scrollBar->state & State_Sunken; - bool hover = scrollBar->state & State_MouseOver; - - QColor sliderColor, blendColor; - hoverColors( sunken, hover, (scrollBar->activeSubControls & SC_ScrollBarSlider) && isEnabled, sliderColor, blendColor); - - QRect rc = scrollBar->rect; - if( horizontal ) - { - painter->fillRect( rc.left(), rc.top() + 2, rc.width(), rc.height() - 4, sliderColor ); - } - else - { - painter->fillRect( rc.left() + 2, rc.top(), rc.width() - 4, rc.height(), sliderColor ); - } - } - break; - - default: - QProxyStyle::drawControl( element, option, painter, widget ); - break; - } -} - -*/ - void LmmsStyle::drawComplexControl( ComplexControl control, const QStyleOptionComplex * option, QPainter *painter, @@ -589,174 +327,6 @@ int LmmsStyle::pixelMetric( PixelMetric _metric, const QStyleOption * _option, } } -// QStyle::SH_TitleBar_NoBorder -/* -QSize LmmsStyle::sizeFromContents( ContentsType type, const QStyleOption* option, const QSize& size, const QWidget* widget ) const -{ - if( type == CT_ScrollBar ) - { - if( const QStyleOptionSlider * scrollBar = qstyleoption_cast( option ) ) - { - int scrollBarExtent = pixelMetric( PM_ScrollBarExtent, option, widget ); - int scrollBarSliderMinimum = pixelMetric( PM_ScrollBarSliderMin, option, widget ); - if( scrollBar->orientation == Qt::Horizontal ) - { - return QSize( BUTTON_LENGTH * 2 + scrollBarSliderMinimum, scrollBarExtent ); - } - else - { - return QSize( scrollBarExtent, BUTTON_LENGTH * 2 + scrollBarSliderMinimum ); - } - } - } - - return QProxyStyle::sizeFromContents( type, option, size, widget ); -} -*/ -/* -QRect LmmsStyle::subControlRect( ComplexControl control, const QStyleOptionComplex* option, SubControl subControl, const QWidget* widget ) const -{ - QRect rect = QProxyStyle::subControlRect( control, option, subControl, widget ); - - switch( control ) - { - case CC_ScrollBar: - if( const QStyleOptionSlider* scrollBar = qstyleoption_cast( option ) ) - { - int scrollBarExtent = pixelMetric( PM_ScrollBarExtent, scrollBar, widget ); - int sliderMaxLength = ( - ( scrollBar->orientation == Qt::Horizontal ) ? - scrollBar->rect.width() : - scrollBar->rect.height() ) - - ( BUTTON_LENGTH * 2 + 6 ); - int sliderMinLength = pixelMetric( PM_ScrollBarSliderMin, scrollBar, widget ); - int sliderLength; - - // calculate slider length - if( scrollBar->maximum != scrollBar->minimum ) - { - uint valueRange = scrollBar->maximum - scrollBar->minimum; - sliderLength = ( scrollBar->pageStep * sliderMaxLength ) / - ( valueRange + scrollBar->pageStep ); - - if( sliderLength < sliderMinLength || valueRange > ( INT_MAX ) / 2 ) - { - sliderLength = sliderMinLength; - } - if( sliderLength > sliderMaxLength ) - { - sliderLength = sliderMaxLength; - } - } - else - { - sliderLength = sliderMaxLength; - } - - int sliderStart = BUTTON_LENGTH + 3 + sliderPositionFromValue( - scrollBar->minimum, - scrollBar->maximum, - scrollBar->sliderPosition, - sliderMaxLength - sliderLength, - scrollBar->upsideDown ); - - QRect scrollBarRect = scrollBar->rect; - - switch( subControl ) - { - case SC_ScrollBarSubLine: // top/left button - if( scrollBar->orientation == Qt::Horizontal ) - { - rect.setRect( scrollBarRect.left() + 2, scrollBarRect.top(), - BUTTON_LENGTH, scrollBarExtent ); - } - else - { - rect.setRect( scrollBarRect.left(), scrollBarRect.top() + 2, - scrollBarExtent, BUTTON_LENGTH ); - } - break; - - case SC_ScrollBarAddLine: // bottom/right button - if( scrollBar->orientation == Qt::Horizontal ) - { - rect.setRect( scrollBarRect.right() - 1 - BUTTON_LENGTH, - scrollBarRect.top(), BUTTON_LENGTH, scrollBarExtent ); - } - else - { - rect.setRect( scrollBarRect.left(), - scrollBarRect.bottom() - 1 - BUTTON_LENGTH, - scrollBarExtent, BUTTON_LENGTH ); - } - break; - - case SC_ScrollBarSubPage: - if( scrollBar->orientation == Qt::Horizontal ) - { - rect.setRect( scrollBarRect.left() + 2 + BUTTON_LENGTH, - scrollBarRect.top(), - sliderStart - ( scrollBarRect.left() + 2 + BUTTON_LENGTH ), - scrollBarExtent ); - } - else - { - rect.setRect( scrollBarRect.left(), - scrollBarRect.top() + 2 + BUTTON_LENGTH, scrollBarExtent, - sliderStart - ( scrollBarRect.left() + 2 + BUTTON_LENGTH ) ); - } - break; - - case SC_ScrollBarAddPage: - if( scrollBar->orientation == Qt::Horizontal ) - { - rect.setRect( sliderStart + sliderLength, 0, - sliderMaxLength - sliderStart - sliderLength, - scrollBarExtent ); - } - else - rect.setRect( 0, sliderStart + sliderLength, scrollBarExtent, - sliderMaxLength - sliderStart - sliderLength ); - break; - - case SC_ScrollBarGroove: - if( scrollBar->orientation == Qt::Horizontal ) - { - rect = scrollBarRect.adjusted( BUTTON_LENGTH, 0, -BUTTON_LENGTH, 0 ); - } - else - { - rect = scrollBarRect.adjusted( 0, BUTTON_LENGTH, 0, -BUTTON_LENGTH ); - } - break; - - case SC_ScrollBarSlider: - if( scrollBar->orientation == Qt::Horizontal ) - { - rect.setRect( sliderStart, 0, sliderLength, scrollBarExtent ); - } - else - { - rect.setRect( 0, sliderStart, scrollBarExtent, sliderLength ); - } - break; - - default: - break; - } - rect = visualRect( scrollBar->direction, scrollBarRect, rect ); - } - break; - - default: - break; - } - - return rect; -} -*/ - - QImage LmmsStyle::colorizeXpm( const char * const * xpm, const QBrush& fill ) const {