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

Use C style comments as per Lennart's fetish :p

This commit is contained in:
Colin Guthrie 2009-03-18 21:01:03 +00:00
parent c6b73de308
commit c4208bfd8e
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cardwidget.cc
View File

@ -54,7 +54,7 @@ void CardWidget::prepareMenu() {
int active_idx = -1; int active_idx = -1;
treeModel->clear(); treeModel->clear();
//Fill the ComboBox's Tree Model: /* Fill the ComboBox's Tree Model */
for (std::map<Glib::ustring, Glib::ustring>::iterator i = profiles.begin(); i != profiles.end(); ++i) { for (std::map<Glib::ustring, Glib::ustring>::iterator i = profiles.begin(); i != profiles.end(); ++i) {
Gtk::TreeModel::Row row = *(treeModel->append()); Gtk::TreeModel::Row row = *(treeModel->append());
row[profileModel.name] = i->first; row[profileModel.name] = i->first;

3
src/cardwidget.h
View File

@ -46,7 +46,7 @@ public:
protected: protected:
virtual void onProfileChange(); virtual void onProfileChange();
//Tree model columns: /* Tree model columns */
class ModelColumns : public Gtk::TreeModel::ColumnRecord class ModelColumns : public Gtk::TreeModel::ColumnRecord
{ {
public: public:
@ -60,7 +60,6 @@ protected:
ModelColumns profileModel; ModelColumns profileModel;
//Child widgets:
Gtk::ComboBox *profileList; Gtk::ComboBox *profileList;
Glib::RefPtr<Gtk::ListStore> treeModel; Glib::RefPtr<Gtk::ListStore> treeModel;
}; };

1
src/mainwindow.cc
View File

@ -143,7 +143,6 @@ void MainWindow::updateCard(const pa_card_info &info) {
w->profiles.insert(std::pair<Glib::ustring,Glib::ustring>(info.profiles[i].name, info.profiles[i].description)); w->profiles.insert(std::pair<Glib::ustring,Glib::ustring>(info.profiles[i].name, info.profiles[i].description));
} }
w->activeProfile = info.active_profile->name; w->activeProfile = info.active_profile->name;
//w->defaultMenuItem.set_active(w->name == defaultSinkName);
w->updating = false; w->updating = false;

2
src/pavucontrol.cc
View File

@ -371,7 +371,7 @@ void context_state_callback(pa_context *c, void *userdata) {
} }
pa_operation_unref(o); pa_operation_unref(o);
// Keep track of the outstanding callbacks for UI tweaks /* Keep track of the outstanding callbacks for UI tweaks */
n_outstanding = 0; n_outstanding = 0;
if (!(o = pa_context_get_server_info(c, server_info_cb, w))) { if (!(o = pa_context_get_server_info(c, server_info_cb, w))) {