summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2019-11-02 11:29:53 +0000
committerSimon McVittie <smcv@debian.org>2024-03-16 17:25:53 +0000
commit89e15a50a6e3c515a71407e28ec9fab35bf61ac7 (patch)
tree295ad26aaf592fd04f99e3c01bdc9fa946f3e427
parentfa4455c1f8928c5aa06bac6d32c4a8dd8717ae4b (diff)
Move 'out' parameters to last position
Newer versions of Vala require this. Signed-off-by: Simon McVittie <smcv@debian.org> Gbp-Pq: Name Move-out-parameters-to-last-position.patch
-rw-r--r--src/Providers/music-tree.vala22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Providers/music-tree.vala b/src/Providers/music-tree.vala
index fe44c9a..0ff55a2 100644
--- a/src/Providers/music-tree.vala
+++ b/src/Providers/music-tree.vala
@@ -173,10 +173,10 @@ public class Gmpc.Provider.MusicTree : Gmpc.Plugin.Base, Gmpc.Plugin.MetaDataIfa
* Helper functions
*/
private async void check_directory_for_files(
- out List<MetaData.Item> list,
GLib.File dir,
GLib.Regex query,
- Gmpc.MetaData.Type type)
+ Gmpc.MetaData.Type type,
+ out List<MetaData.Item> list)
{
var path = dir.get_path();
log(log_domain_cp, GLib.LogLevelFlags.LEVEL_DEBUG,
@@ -230,8 +230,8 @@ public class Gmpc.Provider.MusicTree : Gmpc.Plugin.Base, Gmpc.Plugin.MetaDataIfa
private async void walk_back_directory(GLib.Regex regex_query,
string mpd_directory,
string filename,
- out List<Gmpc.MetaData.Item> list,
- Gmpc.MetaData.Type type)
+ Gmpc.MetaData.Type type,
+ out List<Gmpc.MetaData.Item> list)
{
string base_path = GLib.Path.get_dirname(filename);
log(log_domain_cp, GLib.LogLevelFlags.LEVEL_DEBUG,
@@ -240,19 +240,19 @@ public class Gmpc.Provider.MusicTree : Gmpc.Plugin.Base, Gmpc.Plugin.MetaDataIfa
string path = GLib.Path.build_filename(mpd_directory, base_path);
var dir = File.new_for_path (path);
List<MetaData.Item> temp = null;
- yield check_directory_for_files(out temp, dir, regex_query,type);
+ yield check_directory_for_files(dir, regex_query, type, out temp);
list.concat((owned)temp);
/* one directory up */
dir = dir.get_parent();
if(dir != null)
{
- yield check_directory_for_files(out temp, dir, regex_query,type);
+ yield check_directory_for_files(dir, regex_query, type, out temp);
list.concat((owned)temp);
/* one directory up */
dir = dir.get_parent();
if(dir != null)
{
- yield check_directory_for_files(out temp, dir, regex_query,type);
+ yield check_directory_for_files(dir, regex_query, type, out temp);
list.concat((owned)temp);
}
}
@@ -303,7 +303,7 @@ public class Gmpc.Provider.MusicTree : Gmpc.Plugin.Base, Gmpc.Plugin.MetaDataIfa
}
}
yield walk_back_directory(regex_query, directory, song.file,
- out list, Gmpc.MetaData.Type.ARTIST_ART);
+ Gmpc.MetaData.Type.ARTIST_ART, out list);
log(log_domain_cp, GLib.LogLevelFlags.LEVEL_DEBUG,
"Query done, %u results", list.length());
list.first();
@@ -357,7 +357,7 @@ public class Gmpc.Provider.MusicTree : Gmpc.Plugin.Base, Gmpc.Plugin.MetaDataIfa
}
}
yield walk_back_directory(regex_query, directory, song.file,
- out list, Gmpc.MetaData.Type.ALBUM_ART);
+ Gmpc.MetaData.Type.ALBUM_ART, out list);
list.first();
log(log_domain_cp, GLib.LogLevelFlags.LEVEL_DEBUG,
"Query done, %u results", list.length());
@@ -390,7 +390,7 @@ public class Gmpc.Provider.MusicTree : Gmpc.Plugin.Base, Gmpc.Plugin.MetaDataIfa
return;
}
yield walk_back_directory(regex_query, directory, song.file,
- out list, Gmpc.MetaData.Type.ARTIST_TXT);
+ Gmpc.MetaData.Type.ARTIST_TXT, out list);
log(log_domain_cp, GLib.LogLevelFlags.LEVEL_DEBUG,
"Query done, %u results", list.length());
list.first();
@@ -430,7 +430,7 @@ public class Gmpc.Provider.MusicTree : Gmpc.Plugin.Base, Gmpc.Plugin.MetaDataIfa
return;
}
yield walk_back_directory(regex_query, directory, song.file,
- out list, Gmpc.MetaData.Type.ARTIST_TXT);
+ Gmpc.MetaData.Type.ARTIST_TXT, out list);
log(log_domain_cp, GLib.LogLevelFlags.LEVEL_DEBUG,
"Query done, %u results", list.length());
list.first();