projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inputfile: Use a vector instead of an array on the stack.
[pulseview.git]
/
pv
/
toolbars
/
mainbar.cpp
diff --git
a/pv/toolbars/mainbar.cpp
b/pv/toolbars/mainbar.cpp
index b96bfbe78837325bed9c52b4eb86f35f23411a29..3c8b71e2f7b59a8162fcf39f23135c2d819cd46b 100644
(file)
--- a/
pv/toolbars/mainbar.cpp
+++ b/
pv/toolbars/mainbar.cpp
@@
-305,7
+305,7
@@
void MainBar::update_sample_rate_selector()
if (sr_dev->config_check(ConfigKey::SAMPLERATE, Capability::LIST)) {
try {
gvar_dict = sr_dev->config_list(ConfigKey::SAMPLERATE);
if (sr_dev->config_check(ConfigKey::SAMPLERATE, Capability::LIST)) {
try {
gvar_dict = sr_dev->config_list(ConfigKey::SAMPLERATE);
- } catch (Error error) {
+ } catch (Error
&
error) {
qDebug() << tr("Failed to get sample rate list:") << error.what();
}
} else {
qDebug() << tr("Failed to get sample rate list:") << error.what();
}
} else {
@@
-368,7
+368,7
@@
void MainBar::update_sample_rate_selector_value()
updating_sample_rate_ = true;
sample_rate_.set_value(samplerate);
updating_sample_rate_ = false;
updating_sample_rate_ = true;
sample_rate_.set_value(samplerate);
updating_sample_rate_ = false;
- } catch (Error error) {
+ } catch (Error
&
error) {
qDebug() << tr("Failed to get value of sample rate:") << error.what();
}
}
qDebug() << tr("Failed to get value of sample rate:") << error.what();
}
}
@@
-409,7
+409,7
@@
void MainBar::update_sample_count_selector()
if (gvar.gobj())
g_variant_get(gvar.gobj(), "(tt)",
&min_sample_count, &max_sample_count);
if (gvar.gobj())
g_variant_get(gvar.gobj(), "(tt)",
&min_sample_count, &max_sample_count);
- } catch (Error error) {
+ } catch (Error
&
error) {
qDebug() << tr("Failed to get sample limit list:") << error.what();
}
}
qDebug() << tr("Failed to get sample limit list:") << error.what();
}
}
@@
-501,7
+501,7
@@
void MainBar::commit_sample_rate()
sr_dev->config_set(ConfigKey::SAMPLERATE,
Glib::Variant<guint64>::create(sample_rate));
update_sample_rate_selector();
sr_dev->config_set(ConfigKey::SAMPLERATE,
Glib::Variant<guint64>::create(sample_rate));
update_sample_rate_selector();
- } catch (Error error) {
+ } catch (Error
&
error) {
qDebug() << tr("Failed to configure samplerate:") << error.what();
return;
}
qDebug() << tr("Failed to configure samplerate:") << error.what();
return;
}
@@
-528,7
+528,7
@@
void MainBar::commit_sample_count()
sr_dev->config_set(ConfigKey::LIMIT_SAMPLES,
Glib::Variant<guint64>::create(sample_count));
update_sample_count_selector();
sr_dev->config_set(ConfigKey::LIMIT_SAMPLES,
Glib::Variant<guint64>::create(sample_count));
update_sample_count_selector();
- } catch (Error error) {
+ } catch (Error
&
error) {
qDebug() << tr("Failed to configure sample count:") << error.what();
return;
}
qDebug() << tr("Failed to configure sample count:") << error.what();
return;
}
@@
-540,13
+540,6
@@
void MainBar::commit_sample_count()
update_sample_rate_selector();
}
update_sample_rate_selector();
}
-void MainBar::session_error(const QString text, const QString info_text)
-{
- QMetaObject::invokeMethod(this, "show_session_error",
- Qt::QueuedConnection, Q_ARG(QString, text),
- Q_ARG(QString, info_text));
-}
-
void MainBar::show_session_error(const QString text, const QString info_text)
{
QMessageBox msg(this);
void MainBar::show_session_error(const QString text, const QString info_text)
{
QMessageBox msg(this);