From 0c399be5ffd18519c8eedd8c7662594d19c25862 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 7 May 2013 02:47:43 -0500
Subject: Fix ARGB mode playlist throbber Clean up console warnings

---
 amarok/src/Options8.ui                 | 4 ++--
 amarok/src/engine/xine/xine-config.cpp | 4 ++--
 amarok/src/playlistitem.cpp            | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/amarok/src/Options8.ui b/amarok/src/Options8.ui
index 82e4fb70..afca4c76 100644
--- a/amarok/src/Options8.ui
+++ b/amarok/src/Options8.ui
@@ -72,8 +72,8 @@
                     </property>
                     <property name="minimumSize">
                         <size>
-                            <width>-1</width>
-                            <height>-1</height>
+                            <width>0</width>
+                            <height>0</height>
                         </size>
                     </property>
                     <property name="text">
diff --git a/amarok/src/engine/xine/xine-config.cpp b/amarok/src/engine/xine/xine-config.cpp
index 1972fb09..2f72a55d 100644
--- a/amarok/src/engine/xine/xine-config.cpp
+++ b/amarok/src/engine/xine/xine-config.cpp
@@ -155,9 +155,9 @@ XineEnumEntry::XineEnumEntry(TQComboBox* input, const TQCString & key, xine_t *x
         for( int i = 0; ent.enum_values[i]; ++i )
         {
             input->insertItem( TQString(TQString::fromLocal8Bit( ent.enum_values[i] )) );
-            input->setCurrentItem( ent.num_value );
-            m_val = ent.num_value;
         }
+        input->setCurrentItem( ent.num_value );
+        m_val = ent.num_value;
     }
      connect( input,  TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( entryChanged( int ) ) );
 }
diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp
index bfacc9ee..284c4917 100644
--- a/amarok/src/playlistitem.cpp
+++ b/amarok/src/playlistitem.cpp
@@ -42,8 +42,10 @@
 #include <tdefilemetainfo.h>
 #include <tdeglobal.h>
 #include <kiconeffect.h>
+#include <kimageeffect.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
+#include <tdeapplication.h>
 
 #include "playlistitem.h"
 
@@ -986,6 +988,10 @@ void PlaylistItem::imageTransparency( TQImage& image, float factor ) //static
         c = data[i]; // Memory access is slow, so do it only once
         data[i] = tqRgba( tqRed( c ), tqGreen( c ), tqBlue( c ), table[tqAlpha( c )] );
     }
+
+    if (kapp->isX11CompositionAvailable()) {
+        image = KImageEffect::convertToPremultipliedAlpha(image);
+    }
 }
 
 AtomicString PlaylistItem::artist_album() const
-- 
cgit v1.2.1