itdominator
/
pavucontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make sure that two card profiles with the same priority don't collide with each other

This commit is contained in:
Lennart Poettering 2009-06-17 02:34:22 +02:00
parent 874ebedf16
commit 4e73145363
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mainwindow.cc
View File

@ -37,8 +37,13 @@
/* Used for profile sorting */ /* Used for profile sorting */
struct profile_prio_compare { struct profile_prio_compare {
bool operator() (const pa_card_profile_info& lhs, const pa_card_profile_info& rhs) const bool operator() (const pa_card_profile_info& lhs, const pa_card_profile_info& rhs) const {
{return lhs.priority>rhs.priority;}
if (lhs.priority == rhs.priority)
return strcmp(lhs.name, rhs.name) > 0;
return lhs.priority > rhs.priority;
}
}; };
@ -155,10 +160,12 @@ void MainWindow::updateCard(const pa_card_info &info) {
w->hasSources = w->hasSources || (info.profiles[i].n_sources > 0); w->hasSources = w->hasSources || (info.profiles[i].n_sources > 0);
profile_priorities.insert(info.profiles[i]); profile_priorities.insert(info.profiles[i]);
} }
w->profiles.clear(); w->profiles.clear();
for (std::set<pa_card_profile_info>::iterator i=profile_priorities.begin(); i != profile_priorities.end(); ++i) {
w->profiles.push_back(std::pair<Glib::ustring,Glib::ustring>(i->name,i->description)); for (std::set<pa_card_profile_info>::iterator i = profile_priorities.begin(); i != profile_priorities.end(); ++i)
} w->profiles.push_back(std::pair<Glib::ustring,Glib::ustring>(i->name, i->description));
w->activeProfile = info.active_profile->name; w->activeProfile = info.active_profile->name;
w->updating = false; w->updating = false;