imported 0.2 fixes

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@495 90c681e8-e032-0410-971d-27865f9a5e38

6 files changed, 165 insertions, 161 deletions

diff --git a/src/ui/eqgraph.cpp b/src/ui/eqgraph.cpp
index 314e504d9..1492a32e6 100644
--- a/src/ui/eqgraph.cpp
+++ b/src/ui/eqgraph.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   Copyright (C) 2006-2008 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,142 +22,142 @@
 #include "skin.h"
 #include "eqgraph.h"
 
-EQGraph::EQGraph ( QWidget *parent )
-      : PixmapWidget ( parent )
+EQGraph::EQGraph (QWidget *parent)
+        : PixmapWidget (parent)
 {
-   m_skin = Skin::getPointer();
-   setPixmap ( m_skin->getEqPart ( Skin::EQ_GRAPH ) );
-   clear();
-   draw();
-   connect ( m_skin, SIGNAL ( skinChanged() ), this, SLOT ( updateSkin() ) );
+    m_skin = Skin::getPointer();
+    setPixmap (m_skin->getEqPart (Skin::EQ_GRAPH));
+    clear();
+    draw();
+    connect (m_skin, SIGNAL (skinChanged()), this, SLOT (updateSkin()));
+    setVisible(!m_skin->getEqPart (Skin::EQ_GRAPH).isNull());
 }
 
-
 EQGraph::~EQGraph()
 {}
 
-void EQGraph::addValue ( int value )
+void EQGraph::addValue (int value)
 {
-   if ( m_values.size() >= 10 )
-      return;
-   m_values.append ( value );
-   if ( m_values.size() == 10 )
-   {
-      draw();
-   }
+    if (m_values.size() >= 10)
+        return;
+    m_values.append (value);
+    if (m_values.size() == 10)
+    {
+        draw();
+    }
 }
 
 void EQGraph::clear ()
 {
-   m_values.clear();
-   update();
+    m_values.clear();
+    update();
 }
 
-void EQGraph::init_spline ( double * x, double * y, int n, double * y2 )
+void EQGraph::init_spline (double * x, double * y, int n, double * y2)
 {
-   int i, k;
-   double p, qn, sig, un, *u;
-
-   //u = ( gfloat * ) g_malloc ( n * sizeof ( gfloat ) );
-   u = new double[n];
-
-   y2[0] = u[0] = 0.0;
-
-   for ( i = 1; i < n - 1; i++ )
-   {
-      sig = ( ( double ) x[i] - x[i - 1] ) / ( ( double ) x[i + 1] - x[i - 1] );
-      p = sig * y2[i - 1] + 2.0;
-      y2[i] = ( sig - 1.0 ) / p;
-      u[i] =
-          ( ( ( double ) y[i + 1] - y[i] ) / ( x[i + 1] - x[i] ) ) -
-          ( ( ( double ) y[i] - y[i - 1] ) / ( x[i] - x[i - 1] ) );
-      u[i] = ( 6.0 * u[i] / ( x[i + 1] - x[i - 1] ) - sig * u[i - 1] ) / p;
-   }
-   qn = un = 0.0;
-
-   y2[n - 1] = ( un - qn * u[n - 2] ) / ( qn * y2[n - 2] + 1.0 );
-   for ( k = n - 2; k >= 0; k-- )
-      y2[k] = y2[k] * y2[k + 1] + u[k];
-   //g_free ( u );
-   delete[] u;
+    int i, k;
+    double p, qn, sig, un, *u;
+
+    u = new double[n];
+
+    y2[0] = u[0] = 0.0;
+
+    for (i = 1; i < n - 1; i++)
+    {
+        sig = ((double) x[i] - x[i - 1]) / ((double) x[i + 1] - x[i - 1]);
+        p = sig * y2[i - 1] + 2.0;
+        y2[i] = (sig - 1.0) / p;
+        u[i] =
+            (((double) y[i + 1] - y[i]) / (x[i + 1] - x[i])) -
+            (((double) y[i] - y[i - 1]) / (x[i] - x[i - 1]));
+        u[i] = (6.0 * u[i] / (x[i + 1] - x[i - 1]) - sig * u[i - 1]) / p;
+    }
+    qn = un = 0.0;
+
+    y2[n - 1] = (un - qn * u[n - 2]) / (qn * y2[n - 2] + 1.0);
+    for (k = n - 2; k >= 0; k--)
+        y2[k] = y2[k] * y2[k + 1] + u[k];
+    delete[] u;
 }
 
-double EQGraph::eval_spline ( double xa[], double ya[], double y2a[], int n, double x )
+double EQGraph::eval_spline (double xa[], double ya[], double y2a[], int n, double x)
 {
-   int klo, khi, k;
-   double h, b, a;
-
-   klo = 0;
-   khi = n - 1;
-   while ( khi - klo > 1 )
-   {
-      k = ( khi + klo ) >> 1;
-      if ( xa[k] > x )
-         khi = k;
-      else
-         klo = k;
-   }
-   h = xa[khi] - xa[klo];
-   a = ( xa[khi] - x ) / h;
-   b = ( x - xa[klo] ) / h;
-   return ( a * ya[klo] + b * ya[khi] +
-            ( ( a * a * a - a ) * y2a[klo] +
-              ( b * b * b - b ) * y2a[khi] ) * ( h * h ) / 6.0 );
+    int klo, khi, k;
+    double h, b, a;
+
+    klo = 0;
+    khi = n - 1;
+    while (khi - klo > 1)
+    {
+        k = (khi + klo) >> 1;
+        if (xa[k] > x)
+            khi = k;
+        else
+            klo = k;
+    }
+    h = xa[khi] - xa[klo];
+    a = (xa[khi] - x) / h;
+    b = (x - xa[klo]) / h;
+    return (a * ya[klo] + b * ya[khi] +
+            ((a * a * a - a) * y2a[klo] +
+             (b * b * b - b) * y2a[khi]) * (h * h) / 6.0);
 }
 
 void EQGraph::draw()
 {
-   if(m_values.size()!=10)
-   {
-       setPixmap ( m_skin->getEqPart ( Skin::EQ_GRAPH ) );
-       return;
-   }
-
-   int i, y, ymin, ymax, py = 0;
-   double x[] = { 0, 11, 23, 35, 47, 59, 71, 83, 97, 109 }, yf[10];
-   double *bands = new double[10];
-
-   for ( int i = 0; i<10; ++i )
-   {
-      bands[i] = m_values.at ( i );
-   }
-   QPixmap pixmap = m_skin->getEqPart ( Skin::EQ_GRAPH );
-
-   init_spline ( x, bands, 10, yf );
-   for ( i = 0; i < 109; i++ )
-   {
-      y = 9 -
-          ( int ) ( ( eval_spline ( x, bands, yf, 10, i ) *
-                      9.0 ) / 20.0 );
-      if ( y < 0 )
-         y = 0;
-      if ( y > 18 )
-         y = 18;
-      if ( !i )
-         py = y;
-      if ( y < py )
-      {
-         ymin = y;
-         ymax = py;
-      }
-      else
-      {
-         ymin = py;
-         ymax = y;
-      }
-      py = y;
-
-      QPainter paint ( &pixmap );
-      paint.drawPixmap ( i, y, m_skin->getEqSpline ( y ) ) ;
-
-
-   }
-   setPixmap ( pixmap );
-   delete [] bands;
+    QPixmap pixmap = m_skin->getEqPart (Skin::EQ_GRAPH);
+    if (pixmap.isNull())
+        pixmap = QPixmap(113,19);
+
+    if (m_values.size()!=10)
+    {
+        setPixmap (pixmap);
+        return;
+    }
+
+    int i, y, ymin, ymax, py = 0;
+    double x[] = { 0, 11, 23, 35, 47, 59, 71, 83, 97, 109 }, yf[10];
+    double *bands = new double[10];
+
+    for (int i = 0; i < 10; ++i)
+    {
+        bands[i] = m_values.at (i);
+    }
+
+    init_spline (x, bands, 10, yf);
+    for (i = 0; i < 109; i++)
+    {
+        y = 9 - (int) ((eval_spline (x, bands, yf, 10, i) * 9.0) / 20.0);
+        if (y < 0)
+            y = 0;
+        if (y > 18)
+            y = 18;
+        if (!i)
+            py = y;
+        if (y < py)
+        {
+            ymin = y;
+            ymax = py;
+        }
+        else
+        {
+            ymin = py;
+            ymax = y;
+        }
+        py = y;
+
+        QPainter paint (&pixmap);
+        paint.drawPixmap (i, y, m_skin->getEqSpline (y)) ;
+
+
+    }
+    setPixmap (pixmap);
+    delete [] bands;
 }
 
 void EQGraph::updateSkin()
 {
-   draw();
+    draw();
+    setVisible(!m_skin->getEqPart (Skin::EQ_GRAPH).isNull());
 }
 
diff --git a/src/ui/eqtitlebar.cpp b/src/ui/eqtitlebar.cpp
index 5420831f8..076a81de1 100644
--- a/src/ui/eqtitlebar.cpp
+++ b/src/ui/eqtitlebar.cpp
@@ -163,9 +163,9 @@ void EqTitleBar::shade()
     {
         m_eq->setFixedSize(275,116);
         setPixmap(m_skin->getEqPart(Skin::EQ_TITLEBAR_A));
-        delete m_shade2;
-        delete m_volumeBar;
-        delete m_balanceBar;
+        m_shade2->deleteLater();
+        m_volumeBar->deleteLater();
+        m_balanceBar->deleteLater();
         m_volumeBar = 0;
         m_balanceBar = 0;
         m_shade2 = 0;
diff --git a/src/ui/eqwidget.cpp b/src/ui/eqwidget.cpp
index 07f4ae22b..3f6e1c781 100644
--- a/src/ui/eqwidget.cpp
+++ b/src/ui/eqwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   Copyright (C) 2006-2008 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -38,27 +38,27 @@
 
 
 
-EqWidget::EqWidget ( QWidget *parent )
-        : PixmapWidget ( parent )
+EqWidget::EqWidget (QWidget *parent)
+        : PixmapWidget (parent)
 {
     m_skin = Skin::getPointer();
-    setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint );
-    setPixmap ( m_skin->getEqPart ( Skin::EQ_MAIN ) );
+    setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint);
+    setPixmap (m_skin->getEqPart (Skin::EQ_MAIN));
     //setPixmap(QPixmap(275,116));
-    m_titleBar = new EqTitleBar ( this );
-    m_titleBar -> move ( 0,0 );
+    m_titleBar = new EqTitleBar (this);
+    m_titleBar -> move (0,0);
     m_titleBar -> show();
-    connect ( m_skin, SIGNAL ( skinChanged() ), this, SLOT ( updateSkin() ) );
+    connect (m_skin, SIGNAL (skinChanged()), this, SLOT (updateSkin()));
 
-    m_preamp = new EqSlider ( this );
+    m_preamp = new EqSlider (this);
     m_preamp->show();
-    m_preamp->move ( 21,38 );
-    connect ( m_preamp,SIGNAL ( sliderMoved ( int ) ),SLOT ( setPreamp () ) );
+    m_preamp->move (21,38);
+    connect (m_preamp,SIGNAL (sliderMoved (int)),SLOT (setPreamp ()));
 
-    m_on = new ToggleButton ( this,Skin::EQ_BT_ON_N,Skin::EQ_BT_ON_P,
-                              Skin::EQ_BT_OFF_N,Skin::EQ_BT_OFF_P );
+    m_on = new ToggleButton (this,Skin::EQ_BT_ON_N,Skin::EQ_BT_ON_P,
+                             Skin::EQ_BT_OFF_N,Skin::EQ_BT_OFF_P);
     m_on->show();
-    m_on->move ( 14,18 );
+    m_on->move (14,18);
     connect (m_on, SIGNAL (clicked(bool)), SIGNAL(valueChanged()));
 
     m_autoButton = new ToggleButton(this, Skin::EQ_BT_AUTO_1_N, Skin::EQ_BT_AUTO_1_P,
@@ -68,22 +68,21 @@ EqWidget::EqWidget ( QWidget *parent )
 
     m_eqg = new EQGraph(this);
     m_eqg->move(87,17);
-    m_eqg->show();
 
     m_presetsMenu = new QMenu(this);
 
-    m_presetButton = new Button ( this, Skin::EQ_BT_PRESETS_N, Skin::EQ_BT_PRESETS_P);
+    m_presetButton = new Button (this, Skin::EQ_BT_PRESETS_N, Skin::EQ_BT_PRESETS_P);
     m_presetButton->move(217,18);
     m_presetButton->show();
 
     connect(m_presetButton, SIGNAL(clicked()), SLOT(showPresetsMenu()));
 
-    for ( int i = 0; i<10; ++i )
+    for (int i = 0; i<10; ++i)
     {
-        m_sliders << new EqSlider ( this );
-        m_sliders.at ( i )->move ( 78+i*18,38 );
-        m_sliders.at ( i )->show();
-        connect (m_sliders.at (i), SIGNAL ( sliderMoved (int) ),SLOT (setGain()));
+        m_sliders << new EqSlider (this);
+        m_sliders.at (i)->move (78+i*18,38);
+        m_sliders.at (i)->show();
+        connect (m_sliders.at (i), SIGNAL (sliderMoved (int)),SLOT (setGain()));
     }
     readSettings();
     createActions();
@@ -102,12 +101,12 @@ int EqWidget::preamp()
     return m_preamp->value();
 }
 
-int EqWidget::gain ( int g )
+int EqWidget::gain (int g)
 {
-    return m_sliders.at ( g )->value();
+    return m_sliders.at (g)->value();
 }
 
-void EqWidget::changeEvent ( QEvent * event )
+void EqWidget::changeEvent (QEvent * event)
 {
     if (event->type() == QEvent::ActivationChange)
     {
@@ -115,7 +114,7 @@ void EqWidget::changeEvent ( QEvent * event )
     }
 }
 
-void EqWidget::closeEvent ( QCloseEvent* e)
+void EqWidget::closeEvent (QCloseEvent* e)
 {
     if (e->spontaneous ())
         emit closed();
@@ -124,16 +123,16 @@ void EqWidget::closeEvent ( QCloseEvent* e)
 
 void EqWidget::updateSkin()
 {
-    m_titleBar->setActive ( FALSE );
-    setPixmap ( m_skin->getEqPart ( Skin::EQ_MAIN ) );
+    m_titleBar->setActive (FALSE);
+    setPixmap (m_skin->getEqPart (Skin::EQ_MAIN));
 }
 
 void EqWidget::readSettings()
 {
-    QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat );
-    settings.beginGroup ( "Equalizer" );
+    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    settings.beginGroup ("Equalizer");
     //geometry
-    move ( settings.value ( "pos", QPoint ( 100, 216 ) ).toPoint() );
+    move (settings.value ("pos", QPoint (100, 216)).toPoint());
     //equalizer
     for (int i = 0; i < m_sliders.size(); ++i)
         m_sliders.at(i)->setValue(settings.value("band_"+
@@ -143,7 +142,7 @@ void EqWidget::readSettings()
     settings.endGroup();
     setGain();
     //equalizer presets
-    QSettings eq_preset (QDir::homePath() +"/.qmmp/eq.preset", QSettings::IniFormat );
+    QSettings eq_preset (QDir::homePath() +"/.qmmp/eq.preset", QSettings::IniFormat);
     for (int i = 1; TRUE; ++i)
     {
         if (eq_preset.contains("Presets/Preset"+QString("%1").arg(i)))
@@ -166,7 +165,7 @@ void EqWidget::readSettings()
             break;
     }
     //equalizer auto-load presets
-    QSettings eq_auto (QDir::homePath() +"/.qmmp/eq.auto_preset", QSettings::IniFormat );
+    QSettings eq_auto (QDir::homePath() +"/.qmmp/eq.auto_preset", QSettings::IniFormat);
     for (int i = 1; TRUE; ++i)
     {
         if (eq_auto.contains("Presets/Preset"+QString("%1").arg(i)))
@@ -192,10 +191,10 @@ void EqWidget::readSettings()
 
 void EqWidget::writeSettings()
 {
-    QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat );
-    settings.beginGroup ( "Equalizer" );
+    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    settings.beginGroup ("Equalizer");
     //geometry
-    settings.setValue ( "pos", this->pos() );
+    settings.setValue ("pos", this->pos());
     //equalizer
     for (int i = 0; i < m_sliders.size(); ++i)
         settings.setValue("band_"+QString("%1").arg(i), m_sliders.at(i)->value());
@@ -203,7 +202,7 @@ void EqWidget::writeSettings()
     settings.setValue("enabled",m_on->isChecked());
     settings.endGroup();
     //equalizer presets
-    QSettings eq_preset (QDir::homePath() +"/.qmmp/eq.preset", QSettings::IniFormat );
+    QSettings eq_preset (QDir::homePath() +"/.qmmp/eq.preset", QSettings::IniFormat);
     eq_preset.clear ();
     for (int i = 0; i < m_presets.size(); ++i)
     {
@@ -219,7 +218,7 @@ void EqWidget::writeSettings()
     }
     //equalizer auto-load presets
     QSettings eq_auto (QDir::homePath() +"/.qmmp/eq.auto_preset",
-                       QSettings::IniFormat );
+                       QSettings::IniFormat);
     eq_auto.clear();
     for (int i = 0; i < m_autoPresets.size(); ++i)
     {
@@ -395,11 +394,11 @@ void EqWidget::importWinampEQF()
 
     QFile file(path);
     file.open(QIODevice::ReadOnly);
-    file.read ( header, 31);
+    file.read (header, 31);
     if (QString::fromAscii(header).contains("Winamp EQ library file v1.1"))
     {
 
-        while (file.read ( name, 257))
+        while (file.read (name, 257))
         {
             EQPreset* preset = new EQPreset;
             preset->setText(QString::fromAscii(name));
diff --git a/src/ui/playlisttitlebar.cpp b/src/ui/playlisttitlebar.cpp
index 79e3a74d7..5f3b6cfea 100644
--- a/src/ui/playlisttitlebar.cpp
+++ b/src/ui/playlisttitlebar.cpp
@@ -240,7 +240,7 @@ void PlayListTitleBar::shade()
         m_pl->setMinimumSize (275,116);
         m_pl->setMaximumSize (10000,10000);
         m_pl->resize(width(),m_height);
-        delete m_shade2;
+        m_shade2->deleteLater();
         m_shade2 = 0;
         m_shade->show();
     }
diff --git a/src/ui/skin.cpp b/src/ui/skin.cpp
index 422742bb4..269154d5b 100644
--- a/src/ui/skin.cpp
+++ b/src/ui/skin.cpp
@@ -338,7 +338,12 @@ void Skin::loadEqMain()
     m_eq_parts[ EQ_MAIN ] = pixmap->copy ( 0,0,275,116 );
     m_eq_parts[ EQ_TITLEBAR_A ] = pixmap->copy ( 0,134,275,14 );
     m_eq_parts[ EQ_TITLEBAR_I ] = pixmap->copy ( 0,149,275,14 );
-    m_eq_parts[ EQ_GRAPH ] = pixmap->copy ( 0,294,113,19 );
+
+    if(pixmap->height() > 295)
+        m_eq_parts[ EQ_GRAPH ] = pixmap->copy ( 0,294,113,19 );
+    else
+        m_eq_parts[ EQ_GRAPH ] = QPixmap();
+
     for ( int i = 0; i < 14; ++i )
     {
         m_eq_bar << pixmap->copy ( 13 + i*15,164,14,63 );
diff --git a/src/ui/titlebar.cpp b/src/ui/titlebar.cpp
index 164cf7a60..df88539fd 100644
--- a/src/ui/titlebar.cpp
+++ b/src/ui/titlebar.cpp
@@ -179,11 +179,11 @@ void TitleBar::shade()
     {
         m_mw->setFixedSize(275,116);
         setPixmap(m_skin->getTitleBar(Skin::TITLEBAR_A));
-        delete m_shade2;
-        delete m_currentTime;
-        delete m_control;
+        m_shade2->deleteLater();
+        m_currentTime->deleteLater();
+        m_control->deleteLater();
         SoundCore::instance()->removeVisual(m_visual);
-        delete m_visual;
+        m_visual->deleteLater();
         m_shade2 = 0;
         m_currentTime = 0;
         m_shade->show();