dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace emit with Q_EMIT

Browse Source
This commit is contained in:
Jonas Kvinge
2024-08-25 01:06:30 +02:00
parent cb0db8750f
commit 8da616491d
158 changed files with 891 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine/enginebase.cpp
View File

@@ -152,7 +152,7 @@ bool EngineBase::Play(const QUrl &media_url, const QUrl &stream_url, const bool
void EngineBase::UpdateVolume(const uint volume) {
volume_ = volume;
emit VolumeChanged(volume);
Q_EMIT VolumeChanged(volume);
}
@@ -261,7 +261,7 @@ void EngineBase::EmitAboutToFinish() {
about_to_end_emitted_ = true;
emit TrackAboutToEnd();
Q_EMIT TrackAboutToEnd();
}

38
src/engine/gstengine.cpp
View File

@@ -322,7 +322,7 @@ void GstEngine::Stop(const bool stop_after) {
BufferingFinished();
emit StateChanged(State::Empty);
Q_EMIT StateChanged(State::Empty);
}
@@ -344,7 +344,7 @@ void GstEngine::Pause() {
}
else {
current_pipeline_->SetStateAsync(GST_STATE_PAUSED);
emit StateChanged(State::Paused);
Q_EMIT StateChanged(State::Paused);
StopTimers();
}
}
@@ -367,7 +367,7 @@ void GstEngine::Unpause() {
current_pipeline_->SetStateAsync(GST_STATE_PLAYING);
emit StateChanged(State::Playing);
Q_EMIT StateChanged(State::Playing);
StartTimers();
}
@@ -598,7 +598,7 @@ void GstEngine::EndOfStreamReached(const int pipeline_id, const bool has_next_tr
BufferingFinished();
}
emit TrackEnded();
Q_EMIT TrackEnded();
}
@@ -612,7 +612,7 @@ void GstEngine::HandlePipelineError(const int pipeline_id, const int domain, con
current_pipeline_ = GstEnginePipelinePtr();
BufferingFinished();
emit StateChanged(State::Error);
Q_EMIT StateChanged(State::Error);
if (
(domain == static_cast<int>(GST_RESOURCE_ERROR) && (
@@ -622,21 +622,21 @@ void GstEngine::HandlePipelineError(const int pipeline_id, const int domain, con
))
|| (domain == static_cast<int>(GST_STREAM_ERROR))
) {
emit InvalidSongRequested(stream_url_);
Q_EMIT InvalidSongRequested(stream_url_);
}
else {
emit FatalError();
Q_EMIT FatalError();
}
emit Error(message);
emit Error(debugstr);
Q_EMIT Error(message);
Q_EMIT Error(debugstr);
}
void GstEngine::NewMetaData(const int pipeline_id, const EngineMetadata &engine_metadata) {
if (!current_pipeline_|| current_pipeline_->id() != pipeline_id) return;
emit MetaData(engine_metadata);
Q_EMIT MetaData(engine_metadata);
}
@@ -667,18 +667,18 @@ void GstEngine::FadeoutFinished(const int pipeline_id) {
fadeout_pipelines_.remove(pipeline_id);
FinishPipeline(pipeline);
emit FadeoutFinishedSignal();
Q_EMIT FadeoutFinishedSignal();
}
void GstEngine::FadeoutPauseFinished() {
fadeout_pause_pipeline_->SetStateAsync(GST_STATE_PAUSED);
emit StateChanged(State::Paused);
Q_EMIT StateChanged(State::Paused);
StopTimers();
has_faded_out_to_pause_ = true;
fadeout_pause_pipeline_ = GstEnginePipelinePtr();
emit FadeoutFinishedSignal();
Q_EMIT FadeoutFinishedSignal();
}
@@ -731,10 +731,10 @@ void GstEngine::PlayDone(const GstStateChangeReturn ret, const bool pause, const
StartTimers();
}
emit StateChanged(pause ? State::Paused : State::Playing);
Q_EMIT StateChanged(pause ? State::Paused : State::Playing);
// We've successfully started playing a media stream with this url
emit ValidSongRequested(stream_url_);
Q_EMIT ValidSongRequested(stream_url_);
}
@@ -901,9 +901,9 @@ GstEnginePipelinePtr GstEngine::CreatePipeline(const QUrl &media_url, const QUrl
QString error;
if (!ret->InitFromUrl(media_url, stream_url, gst_url, end_nanosec, ebur128_loudness_normalizing_gain_db, error)) {
ret.reset();
emit Error(error);
emit StateChanged(State::Error);
emit FatalError();
Q_EMIT Error(error);
Q_EMIT StateChanged(State::Error);
Q_EMIT FatalError();
}
return ret;
@@ -1084,7 +1084,7 @@ void GstEngine::StreamDiscovered(GstDiscoverer*, GstDiscovererInfo *info, GError
qLog(Debug) << "Got stream info for" << discovered_url + ":" << Song::TextForFiletype(engine_metadata.filetype);
emit instance->MetaData(engine_metadata);
Q_EMIT instance->MetaData(engine_metadata);
}
else {

30
src/engine/gstenginepipeline.cpp
View File

@@ -1086,7 +1086,7 @@ void GstEnginePipeline::SourceSetupCallback(GstElement *playbin, GstElement *sou
if (instance->buffering_) {
qLog(Debug) << "Buffering finished";
instance->buffering_ = false;
emit instance->BufferingFinished();
Q_EMIT instance->BufferingFinished();
instance->SetStateAsync(GST_STATE_PLAYING);
}
@@ -1106,7 +1106,7 @@ void GstEnginePipeline::NotifyVolumeCallback(GstElement *element, GParamSpec *pa
const uint volume_percent = static_cast<uint>(qBound(0L, lround(instance->volume_internal_ / 0.01), 100L));
if (volume_percent != instance->volume_percent_) {
instance->volume_percent_ = volume_percent;
emit instance->VolumeChanged(volume_percent);
Q_EMIT instance->VolumeChanged(volume_percent);
}
}
@@ -1336,11 +1336,11 @@ GstPadProbeReturn GstEnginePipeline::BufferProbeCallback(GstPad *pad, GstPadProb
// GstEngine will try to seek to the start of the new section, but we're already there so ignore it.
instance->ignore_next_seek_ = true;
emit instance->EndOfStreamReached(instance->id(), true);
Q_EMIT instance->EndOfStreamReached(instance->id(), true);
}
else {
// There's no next song
emit instance->EndOfStreamReached(instance->id(), false);
Q_EMIT instance->EndOfStreamReached(instance->id(), false);
}
}
@@ -1362,7 +1362,7 @@ void GstEnginePipeline::AboutToFinishCallback(GstPlayBin *playbin, gpointer self
instance->SetNextUrl();
}
emit instance->AboutToFinish();
Q_EMIT instance->AboutToFinish();
}
@@ -1374,7 +1374,7 @@ GstBusSyncReply GstEnginePipeline::BusSyncCallback(GstBus *bus, GstMessage *msg,
switch (GST_MESSAGE_TYPE(msg)) {
case GST_MESSAGE_EOS:
emit instance->EndOfStreamReached(instance->id(), false);
Q_EMIT instance->EndOfStreamReached(instance->id(), false);
break;
case GST_MESSAGE_TAG:
@@ -1473,7 +1473,7 @@ void GstEnginePipeline::StreamStartMessageReceived() {
next_beginning_offset_nanosec_ = 0;
next_end_offset_nanosec_ = 0;
emit EndOfStreamReached(id(), true);
Q_EMIT EndOfStreamReached(id(), true);
}
}
@@ -1549,7 +1549,7 @@ void GstEnginePipeline::ErrorMessageReceived(GstMessage *msg) {
}
#endif
emit Error(id(), static_cast<int>(domain), code, message, debugstr);
Q_EMIT Error(id(), static_cast<int>(domain), code, message, debugstr);
}
@@ -1602,7 +1602,7 @@ void GstEnginePipeline::TagMessageReceived(GstMessage *msg) {
gst_tag_list_unref(taglist);
emit MetadataFound(id(), engine_metadata);
Q_EMIT MetadataFound(id(), engine_metadata);
}
@@ -1716,7 +1716,7 @@ void GstEnginePipeline::BufferingMessageReceived(GstMessage *msg) {
if (percent < 100 && !buffering_) {
qLog(Debug) << "Buffering started";
buffering_ = true;
emit BufferingStarted();
Q_EMIT BufferingStarted();
if (current_state == GST_STATE_PLAYING) {
SetStateAsync(GST_STATE_PAUSED);
if (pending_state_ == GST_STATE_NULL) {
@@ -1727,7 +1727,7 @@ void GstEnginePipeline::BufferingMessageReceived(GstMessage *msg) {
else if (percent == 100 && buffering_) {
qLog(Debug) << "Buffering finished";
buffering_ = false;
emit BufferingFinished();
Q_EMIT BufferingFinished();
if (pending_seek_nanosec_ != -1) {
SeekAsync(pending_seek_nanosec_);
pending_seek_nanosec_ = -1;
@@ -1738,7 +1738,7 @@ void GstEnginePipeline::BufferingMessageReceived(GstMessage *msg) {
}
}
else if (buffering_) {
emit BufferingProgress(percent);
Q_EMIT BufferingProgress(percent);
}
}
@@ -1800,10 +1800,10 @@ void GstEnginePipeline::SetStateAsyncFinished(const GstState state, const GstSta
case GST_STATE_CHANGE_ASYNC:
case GST_STATE_CHANGE_NO_PREROLL:
qLog(Debug) << "Pipeline" << id_ << "state successfully set to" << GstStateText(state);
emit SetStateFinished(state_change);
Q_EMIT SetStateFinished(state_change);
if (!finished_ && finish_requested_) {
finished_ = true;
emit Finished();
Q_EMIT Finished();
}
break;
case GST_STATE_CHANGE_FAILURE:
@@ -2046,7 +2046,7 @@ void GstEnginePipeline::timerEvent(QTimerEvent *e) {
if (e->timerId() == fader_fudge_timer_.timerId()) {
fader_fudge_timer_.stop();
emit FaderFinished(id_);
Q_EMIT FaderFinished(id_);
return;
}

12
src/engine/vlcengine.cpp
View File

@@ -311,30 +311,30 @@ void VLCEngine::StateChangedCallback(const libvlc_event_t *e, void *data) {
const EngineBase::State state = engine->state_;
engine->state_ = EngineBase::State::Empty;
if (state == EngineBase::State::Playing) {
emit engine->StateChanged(engine->state_);
Q_EMIT engine->StateChanged(engine->state_);
}
break;
}
case libvlc_MediaPlayerEncounteredError:
engine->state_ = EngineBase::State::Error;
emit engine->StateChanged(engine->state_);
emit engine->FatalError();
Q_EMIT engine->StateChanged(engine->state_);
Q_EMIT engine->FatalError();
break;
case libvlc_MediaPlayerPlaying:
engine->state_ = EngineBase::State::Playing;
emit engine->StateChanged(engine->state_);
Q_EMIT engine->StateChanged(engine->state_);
break;
case libvlc_MediaPlayerPaused:
engine->state_ = EngineBase::State::Paused;
emit engine->StateChanged(engine->state_);
Q_EMIT engine->StateChanged(engine->state_);
break;
case libvlc_MediaPlayerEndReached:
engine->state_ = EngineBase::State::Idle;
emit engine->TrackEnded();
Q_EMIT engine->TrackEnded();
break;
}