Add dialog to display streams' audio details #5547
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hatstand
reviewed
Dec 13, 2016
| g_object_unref(discoverer_); | ||
| } | ||
|
|
||
| void StreamDiscoverer::discover(QString url) { |
There was a problem hiding this comment.
Please follow the style guide: https://google.github.io/styleguide/cppguide.html
e.g. Discover not discover and `const QString& url
hatstand
requested changes
Dec 21, 2016
| qLog(Debug) << "Discover" << url; | ||
| std::string url_std = url.toStdString(); | ||
| const char* url_c = url_std.c_str(); | ||
| if (!gst_discoverer_discover_uri_async(discoverer_, url_c)) { |
There was a problem hiding this comment.
inline url.toStdString().c_str()
| if (!gst_discoverer_discover_uri_async(discoverer_, url_c)) { | ||
| qLog(Error) << "Failed to start discovering" << url | ||
| << endl; | ||
| g_object_unref(discoverer_); |
There was a problem hiding this comment.
This is done in the destructor anyway
| } | ||
|
|
||
| // Creating a loop and setting it to run. That way we can wait for signals. | ||
| QEventLoop loop; |
There was a problem hiding this comment.
WaitForSignal(this, SIGNAL(DiscovererFinished()))
| loop.exec(); | ||
| } | ||
|
|
||
| void StreamDiscoverer::on_discovered_cb(GstDiscoverer* discoverer, |
| // Get audio streams (we will only care about the first one, which should be the only one). | ||
| GList* audio_streams = gst_discoverer_info_get_audio_streams(info); | ||
|
|
||
| if (audio_streams != NULL) { |
| private: | ||
| GstDiscoverer* discoverer_; | ||
|
|
||
| static const unsigned int kDiscoveryTimeoutS; |
| static void on_finished_cb(GstDiscoverer* discoverer, gpointer instance); | ||
|
|
||
| // Helper to return descriptive error messages: | ||
| static QString gstDiscovererErrorMessage(GstDiscovererResult result); |
There was a problem hiding this comment.
GstDiscovererErrorMessage
| void on_buttonBox_rejected(); | ||
|
|
||
| private: | ||
| Ui::StreamDetailsDialog* ui; |
There was a problem hiding this comment.
std::unique_ptr<Ui::StreamDetailsDialog> ui_
| void setSampleRate(unsigned int); | ||
|
|
||
| private slots: | ||
| void on_buttonBox_rejected(); |
| struct StreamDetails { | ||
| QString url; | ||
| QString format; | ||
| unsigned int bitrate; |
There was a problem hiding this comment.
unsigned just makes it harder to read.
hatstand
approved these changes
Dec 21, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
More info: #5455.