From eaa2e021a64aea89640282dc9d08e0a001e8957b Mon Sep 17 00:00:00 2001
From: Tobias Rundstrom <tru@xmms.org>
Date: Sun, 19 Feb 2006 16:53:10 -0300
Subject: [PATCH] Promoe now shows kbps / khz for the playing entry.

---
 MainDisplay.cpp        |  4 ++--
 SmallNumberDisplay.cpp | 20 +++-----------------
 SmallNumberDisplay.h   |  3 +--
 XMMSHandler.cpp        | 10 ++++++++++
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/MainDisplay.cpp b/MainDisplay.cpp
index b6744f3..df8746d 100644
--- a/MainDisplay.cpp
+++ b/MainDisplay.cpp
@@ -25,11 +25,11 @@ MainDisplay::MainDisplay (QWidget *parent) : SkinDisplay(parent)
 
 	m_kbps = new SmallNumberDisplay (this, 15);
 	m_kbps->move (111, 43);
-	m_kbps->setNumber ('1', '2', '8');
+	m_kbps->setNumber (128, 3);
 
 	m_khz = new SmallNumberDisplay (this, 10);
 	m_khz->move (156, 43);
-	m_khz->setNumber ('4', '4');
+	m_khz->setNumber (44, 2);
 
 }
 
diff --git a/SmallNumberDisplay.cpp b/SmallNumberDisplay.cpp
index 66d7c7e..444ae28 100644
--- a/SmallNumberDisplay.cpp
+++ b/SmallNumberDisplay.cpp
@@ -16,24 +16,10 @@ SmallNumberDisplay::setPixmaps (Skin *skin)
 }
 
 void
-SmallNumberDisplay::setNumber (char i1, char i2, char i3)
+SmallNumberDisplay::setNumber (int num, int len)
 {
-	m_nums[0] = i1;
-	m_nums[1] = i2;
-	m_nums[2] = i3;
-	m_num = 3;
-
-	drawNumber ();
-
-	update ();
-}
-
-void
-SmallNumberDisplay::setNumber (char i1, char i2)
-{
-	m_nums[0] = i1;
-	m_nums[1] = i2;
-	m_num = 2;
+	snprintf (m_nums, len+1, "%d", num);
+	m_num = len;
 
 	drawNumber ();
 
diff --git a/SmallNumberDisplay.h b/SmallNumberDisplay.h
index 5c3473b..2032ad0 100644
--- a/SmallNumberDisplay.h
+++ b/SmallNumberDisplay.h
@@ -10,8 +10,7 @@ class SmallNumberDisplay : public PixWidget
 		SmallNumberDisplay (QWidget *parent, int w);
 		~SmallNumberDisplay () { };
 
-		void setNumber (char i1, char i2, char i3);
-		void setNumber (char i1, char i2);
+		void setNumber (int num, int len);
 
 	public slots:
 		void setPixmaps (Skin *skin);
diff --git a/XMMSHandler.cpp b/XMMSHandler.cpp
index 6936b7c..66cf010 100644
--- a/XMMSHandler.cpp
+++ b/XMMSHandler.cpp
@@ -57,11 +57,21 @@ void
 XMMSHandler::medialib_info (XMMSResult *res)
 {
 	char str[4096];
+	int b;
 
+	/* Make this NICER! */
 	res->entryFormat (str, 4096, "${artist} - ${album} - ${title}");
 	qDebug ("%s", str);
 	m_mw->getMD ()->m_text->setText (QString::fromUtf8 (str));
 
+	if (res->getDictValue ("bitrate", &b)) {
+		m_mw->getMD ()->m_kbps->setNumber (b/1000, 3);
+	}
+
+	if (res->getDictValue ("samplerate", &b)) {
+		m_mw->getMD ()->m_khz->setNumber (b/1000, 2);
+	}
+
 	delete res;
 }