ModernDesktopInitiative/koto
4
0
Fork 0
Code Issues 17 Pull requests Projects Releases Packages Wiki Activity Actions

Rename all KotoIndexed* to Koto*, KOTO_INDEXED_ to KOTO_, etc. Fixes #9.

Browse source
This commit is contained in:
Joshua Strobl 2021-05-11 20:08:39 +03:00
parent 62de9c2032
commit 9f0e8dfbc8
28 changed files with 490 additions and 490 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/playback/engine.c
View file

@ -57,7 +57,7 @@ struct _KotoPlaybackEngine {
GstQuery * duration_query;
GstQuery * position_query;
KotoIndexedTrack * current_track;
KotoTrack * current_track;
gboolean is_muted;
gboolean is_repeat_enabled;
@ -271,7 +271,7 @@ void koto_playback_engine_forwards(KotoPlaybackEngine * self) {
}
}
KotoIndexedTrack * koto_playback_engine_get_current_track(KotoPlaybackEngine * self) {
KotoTrack * koto_playback_engine_get_current_track(KotoPlaybackEngine * self) {
return self->current_track;
}
@ -436,10 +436,10 @@ void koto_playback_engine_set_track_by_uuid(
return;
}
KotoIndexedTrack * track = koto_cartographer_get_track_by_uuid(koto_maps, track_uuid); // Get the track from cartographer
KotoTrack * track = koto_cartographer_get_track_by_uuid(koto_maps, track_uuid); // Get the track from cartographer
if (!KOTO_IS_INDEXED_TRACK(track)) { // Not a track
if (!KOTO_IS_TRACK(track)) { // Not a track
return;
}
@ -464,7 +464,7 @@ void koto_playback_engine_set_track_by_uuid(
koto_playback_engine_set_position(self, 0);
koto_playback_engine_set_volume(self, self->volume); // Re-enforce our volume on the updated playbin
GVariant * metadata = koto_indexed_track_get_metadata_vardict(track); // Get the GVariantBuilder variable dict for the metadata
GVariant * metadata = koto_track_get_metadata_vardict(track); // Get the GVariantBuilder variable dict for the metadata
GVariantDict * metadata_dict = g_variant_dict_new(metadata);

2
src/playback/engine.h
View file

@ -49,7 +49,7 @@ void koto_playback_engine_current_playlist_changed();
void koto_playback_engine_forwards(KotoPlaybackEngine * self);
KotoIndexedTrack * koto_playback_engine_get_current_track(KotoPlaybackEngine * self);
KotoTrack * koto_playback_engine_get_current_track(KotoPlaybackEngine * self);
gint64 koto_playback_engine_get_duration(KotoPlaybackEngine * self);

20
src/playback/mpris.c
View file

@ -212,10 +212,10 @@ GVariant * handle_get_property(
}
if (g_strcmp0(property_name, "Metadata") == 0) { // Metadata
KotoIndexedTrack * current_track = koto_playback_engine_get_current_track(playback_engine);
KotoTrack * current_track = koto_playback_engine_get_current_track(playback_engine);
if (KOTO_IS_INDEXED_TRACK(current_track)) { // Currently playing a track
ret = koto_indexed_track_get_metadata_vardict(current_track);
if (KOTO_IS_TRACK(current_track)) { // Currently playing a track
ret = koto_track_get_metadata_vardict(current_track);
} else { // No track
GVariantBuilder * builder = g_variant_builder_new(G_VARIANT_TYPE_VARDICT); // Create an empty builder
ret = g_variant_builder_end(builder); // return the vardict
@ -226,8 +226,8 @@ GVariant * handle_get_property(
(g_strcmp0(property_name, "CanPlay") == 0) ||
(g_strcmp0(property_name, "CanPause") == 0)
) {
KotoIndexedTrack * current_track = koto_playback_engine_get_current_track(playback_engine);
ret = g_variant_new_boolean(KOTO_IS_INDEXED_TRACK(current_track));
KotoTrack * current_track = koto_playback_engine_get_current_track(playback_engine);
ret = g_variant_new_boolean(KOTO_IS_TRACK(current_track));
}
if (g_strcmp0(property_name, "CanSeek") == 0) { // Can control position over mpris
@ -316,22 +316,22 @@ void koto_update_mpris_playback_state(GstState state) {
);
}
void koto_update_mpris_info_for_track(KotoIndexedTrack * track) {
if (!KOTO_IS_INDEXED_TRACK(track)) {
void koto_update_mpris_info_for_track(KotoTrack * track) {
if (!KOTO_IS_TRACK(track)) {
return;
}
GVariant * metadata = koto_indexed_track_get_metadata_vardict(track); // Get the GVariantBuilder variable dict for the metadata
GVariant * metadata = koto_track_get_metadata_vardict(track); // Get the GVariantBuilder variable dict for the metadata
koto_update_mpris_info_for_track_with_metadata(track, metadata);
}
void koto_update_mpris_info_for_track_with_metadata(
KotoIndexedTrack * track,
KotoTrack * track,
GVariant * metadata
) {
if (!KOTO_IS_INDEXED_TRACK(track)) {
if (!KOTO_IS_TRACK(track)) {
return;
}

4
src/playback/mpris.h
View file

@ -23,10 +23,10 @@
void koto_update_mpris_playback_state(GstState state);
void koto_update_mpris_info_for_track(KotoIndexedTrack * track);
void koto_update_mpris_info_for_track(KotoTrack * track);
void koto_update_mpris_info_for_track_with_metadata(
KotoIndexedTrack * track,
KotoTrack * track,
GVariant * metadata
);