Hi all,

For a long time now I haven't been able to get Promoe to compile as it
was coming up with many Boost compile-time assertion failures.

I finally looked into this and found the following changes are all
that's needed to get it to compile.

Have I done this correctly?  If so, can these changes be included in
the main repo?  It looks like the boost::variant type is declared with
an int32_t but some code tries to request a uint32_t instead.

Many thanks,
Adam.

--

diff --git a/backend_xmmsclient++/xclient.cpp b/backend_xmmsclient++/xclient.cpp
index 112b66a..14e48df 100644
--- a/backend_xmmsclient++/xclient.cpp
+++ b/backend_xmmsclient++/xclient.cpp
@@ -166,7 +166,7 @@ XClient::dictToQHash (const std::string &key,
                             QVariant (boost::get< int32_t > (value)));
        } else if (value.type () == typeid (uint32_t)) {
                hash.insert (QString::fromLatin1 (key.c_str ()),
-                            QVariant (boost::get< uint32_t > (value)));
+                            QVariant (boost::get< int32_t > (value)));
        } else {
                QString val;
                val = QString::fromUtf8 (boost::get< std::string > 
(value).c_str ());
@@ -220,7 +220,7 @@ XClient::propDictToQHash (const std::string &key,
                             QVariant (boost::get< int32_t > (value)));
        } else if (value.type () == typeid (uint32_t)) {
                hash.insert (QString::fromLatin1 (key.c_str ()),
-                            QVariant (boost::get< uint32_t > (value)));
+                            QVariant (boost::get< int32_t > (value)));
        } else {
                QString val;
                if (key == "url") {
diff --git a/src/BrowseModel.cpp b/src/BrowseModel.cpp
index 3c54a9a..0e4ca3d 100644
--- a/src/BrowseModel.cpp
+++ b/src/BrowseModel.cpp
@@ -129,7 +129,7 @@ BrowseModel::list_cb (const Xmms::List< Xmms::Dict > &res)
                                        name += " - ";
                                }
                                if (d.contains ("tracknr")) {
-                                       name += QString::number (d.get<uint32_t>
+                                       name += QString::number (d.get<int32_t>
                                                                                
         ("tracknr")).rightJustified(2, '0');
                                        name += " - ";
                                }

--
_______________________________________________
Xmms2-devel mailing list
Xmms2-devel@lists.xmms2.org
https://lists.xmms2.org/cgi-bin/mailman/listinfo/xmms2-devel

Reply via email to