On Mon, Jan 16, 2006 at 05:19:09PM +0000, Chris Cannam wrote:
> What is line 1011 of audiomanagerdialog.cpp? It should be:
>
> nameMap[strtoqstr((*aIt)->getFilename())] = (*aIt)->getId();
Got it now, my CVS must've been off. Still need the hunks below. In
addition, need to hack around the fact that scons doesn't link
rosestrings.o into rosegardensequencer. I'm not familiar with scons,
so I've just rigged this.
Am I the only one with this difficulty?
Index: bankeditor.cpp
===================================================================
RCS file: /cvsroot/rosegarden/gui/bankeditor.cpp,v
retrieving revision 1.130
diff -u -r1.130 bankeditor.cpp
--- bankeditor.cpp 16 Jan 2006 13:09:26 -0000 1.130
+++ bankeditor.cpp 18 Jan 2006 06:03:04 -0000
@@ -2261,7 +2261,7 @@
for (Rosegarden::KeyMappingList::iterator i = kml.begin();
i != kml.end(); ++i) {
- if (i->getName() == oldName) {
+ if (i->getName() == qstrtostr(oldName)) {
i->setName(qstrtostr(label));
break;
}
Index: sound/AlsaDriver.cpp
===================================================================
RCS file: /cvsroot/rosegarden/sound/AlsaDriver.cpp,v
retrieving revision 1.389
diff -u -r1.389 AlsaDriver.cpp
--- sound/AlsaDriver.cpp 16 Jan 2006 13:09:29 -0000 1.389
+++ sound/AlsaDriver.cpp 18 Jan 2006 06:02:06 -0000
@@ -4568,7 +4568,8 @@
if ((*k)->m_client == firstOther.first &&
(*k)->m_port == firstOther.second) {
m_devicePortMap[(*i)->getId()] = firstOther;
- setConnectionToDevice(**i, (*k)->m_name,
firstOther);
+ setConnectionToDevice(**i,
+ strtoqstr((*k)->m_name), firstOther);
madeChange = true;
break;
}
--
Ross Vandegrift
[EMAIL PROTECTED]
"The good Christian should beware of mathematicians, and all those who
make empty prophecies. The danger already exists that the mathematicians
have made a covenant with the devil to darken the spirit and to confine
man in the bonds of Hell."
--St. Augustine, De Genesi ad Litteram, Book II, xviii, 37
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Rosegarden-devel mailing list
[email protected] - use the link below to unsubscribe
https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
