slightly more explicit imports
i had no idea where these were from; now i do :) vala is super loose about these..
This commit is contained in:
parent
367111171f
commit
8c42d99c18
7 changed files with 13 additions and 13 deletions
|
@ -1,6 +1,6 @@
|
|||
Subsonic public_api;
|
||||
|
||||
public class Application : Adw.Application {
|
||||
public class Audrey.Application : Adw.Application {
|
||||
public Application () {
|
||||
Object (
|
||||
application_id: "eu.callcc.audrey",
|
||||
|
@ -9,7 +9,7 @@ public class Application : Adw.Application {
|
|||
}
|
||||
|
||||
construct {
|
||||
ActionEntry[] action_entries = {
|
||||
GLib.ActionEntry[] action_entries = {
|
||||
{ "about", this.on_about_action },
|
||||
{ "preferences", this.on_preferences_action },
|
||||
{ "quit", this.quit }
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
|
||||
namespace Config {
|
||||
namespace Audrey.Config {
|
||||
public const string GETTEXT_PACKAGE;
|
||||
public const string LOCALEDIR;
|
||||
public const string PACKAGE_VERSION;
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
int main (string[] args) {
|
||||
Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
|
||||
Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
|
||||
Intl.textdomain (Config.GETTEXT_PACKAGE);
|
||||
Intl.bindtextdomain (Audrey.Config.GETTEXT_PACKAGE, Audrey.Config.LOCALEDIR);
|
||||
Intl.bind_textdomain_codeset (Audrey.Config.GETTEXT_PACKAGE, "UTF-8");
|
||||
Intl.textdomain (Audrey.Config.GETTEXT_PACKAGE);
|
||||
|
||||
Gst.init (ref args);
|
||||
|
||||
var app = new Application ();
|
||||
var app = new Audrey.Application ();
|
||||
return app.run (args);
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@ enum PlaybinState {
|
|||
PLAYING,
|
||||
}
|
||||
|
||||
class Playbin : Object {
|
||||
class Playbin : GLib.Object {
|
||||
// dynamic: undocumented vala feature
|
||||
// lets us access the about-to-finish signal
|
||||
private dynamic Gst.Element playbin = Gst.ElementFactory.make ("playbin3", null);
|
||||
|
@ -45,7 +45,7 @@ class Playbin : Object {
|
|||
|
||||
// ASSUMPTION: about-to-finish will be signalled exactly once per track
|
||||
// even if seeking backwards after
|
||||
AsyncQueue<string> next_uri = new AsyncQueue<string> ();
|
||||
GLib.AsyncQueue<string> next_uri = new GLib.AsyncQueue<string> ();
|
||||
|
||||
private ListModel _play_queue = null;
|
||||
private ulong _play_queue_items_changed;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// this is a custom SelectionModel that lets us only signal the
|
||||
// selection has changed on user interaction
|
||||
class PlayQueueSelection : Object, ListModel, Gtk.SelectionModel {
|
||||
class PlayQueueSelection : GLib.Object, GLib.ListModel, Gtk.SelectionModel {
|
||||
public ListStore inner { get; private set; }
|
||||
|
||||
private uint _selected_position;
|
||||
|
@ -22,7 +22,7 @@ class PlayQueueSelection : Object, ListModel, Gtk.SelectionModel {
|
|||
public signal void user_selected (uint position);
|
||||
|
||||
internal PlayQueueSelection () {
|
||||
this.inner = new ListStore (typeof (Song));
|
||||
this.inner = new GLib.ListStore (typeof (Song));
|
||||
this._selected_position = inner.get_n_items ();
|
||||
|
||||
this.inner.items_changed.connect ((position, removed, added) => {
|
||||
|
|
|
@ -8,7 +8,7 @@ static void salt_password (string password, out string token, out string salt) {
|
|||
salt_chars[2*i+1] = "0123456789abcdef"[(salt_bytes[i]>>0)&0xf];
|
||||
}
|
||||
salt_chars[2*SALT_BYTES] = 0;
|
||||
var checksum = new Checksum (ChecksumType.MD5);
|
||||
var checksum = new GLib.Checksum (ChecksumType.MD5);
|
||||
checksum.update ((uchar[]) password, -1);
|
||||
checksum.update (salt_chars, -1);
|
||||
|
||||
|
|
|
@ -100,7 +100,7 @@ class Ui.Window : Adw.ApplicationWindow {
|
|||
if (this.cancel_loading_art != null) {
|
||||
this.cancel_loading_art.cancel ();
|
||||
}
|
||||
this.cancel_loading_art = new Cancellable ();
|
||||
this.cancel_loading_art = new GLib.Cancellable ();
|
||||
|
||||
this.playing_cover_art = Gdk.Paintable.empty (1, 1);
|
||||
if (this.song != null) {
|
||||
|
|
Loading…
Reference in a new issue