Commit 0e002647 authored by Canek Peláez's avatar Canek Peláez
Browse files

Shut up warnings from valac 0.34. 

Apparently, you cannot mix static and const. I don't understand why.
parent c133f5a0

lib/mlm/file-tags.vala

+13 −13
Original line number Diff line number Diff line
@@ -20,21 +20,21 @@ 
namespace MLM {



    namespace FrameId {

        public static const string ARTIST   = "TPE1";

        public static const string TITLE    = "TIT2";

        public static const string ALBUM    = "TALB";

        public static const string BAND     = "TPE2";

        public static const string YEAR     = "TDRC";

        public static const string TRACK    = "TRCK";

        public static const string DISC     = "TPOS";

        public static const string GENRE    = "TCON";

        public static const string COMMENT  = "COMM";

        public static const string COMPOSER = "TCOM";

        public static const string ORIGINAL = "TOPE";

        public static const string PICTURE  = "APIC";

        public const string ARTIST   = "TPE1";

        public const string TITLE    = "TIT2";

        public const string ALBUM    = "TALB";

        public const string BAND     = "TPE2";

        public const string YEAR     = "TDRC";

        public const string TRACK    = "TRCK";

        public const string DISC     = "TPOS";

        public const string GENRE    = "TCON";

        public const string COMMENT  = "COMM";

        public const string COMPOSER = "TCOM";

        public const string ORIGINAL = "TOPE";

        public const string PICTURE  = "APIC";

        /* The following are added for completeness, but are not

         * really used by the suite. */

        public static const string POPULARIMETER  = "POPM";

        public const string POPULARIMETER  = "POPM";

    }



    public class FileTags {

lib/mlm/util.vala

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ namespace MLM { 


        private static bool get_should_colorize_called = false;

        private static bool should_colorize = true;

        private static const string MLM_DONT_COLORIZE = "MLM_DONT_COLORIZE";

        private const string MLM_DONT_COLORIZE = "MLM_DONT_COLORIZE";



        public static string color(string s, Color c) {

            if (!get_should_colorize() || c == Color.NONE)

src/accommodator/accommodator.vala

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ namespace MLM { 
                          Util.color(dst.get_basename(), Color.GREEN));

        }



        private static const string CONTEXT =

        private const string CONTEXT =

            "[FILENAME...] - Accommodate MP3 files";



        public static int main(string[] args) {

src/analyze/analyze.vala

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ namespace MLM { 
            file.close();

        }



        private static const string CONTEXT =

        private const string CONTEXT =

            "[FILENAME...] - Analyze Id3v2.4.0 tags";



        public static int main(string[] args) {

src/application/application-window.vala

+5 −5
Original line number Diff line number Diff line
@@ -222,11 +222,11 @@ namespace MLM { 
        private Encoder encoder;

        private string target;



        private static const string ICON_NAME_CD = "media-optical-cd-audio-symbolic";

        private static const string ICON_NAME_AVATAR = "avatar-default-symbolic";

        private static const string ICON_NAME_PLAY = "media-playback-start-symbolic";

        private static const string ICON_NAME_PAUSE = "media-playback-pause-symbolic";

        private static const Gtk.IconSize ICON_SIZE = Gtk.IconSize.SMALL_TOOLBAR;

        private const string ICON_NAME_CD = "media-optical-cd-audio-symbolic";

        private const string ICON_NAME_AVATAR = "avatar-default-symbolic";

        private const string ICON_NAME_PLAY = "media-playback-start-symbolic";

        private const string ICON_NAME_PAUSE = "media-playback-pause-symbolic";

        private const Gtk.IconSize ICON_SIZE = Gtk.IconSize.SMALL_TOOLBAR;



        public ApplicationWindow(Gtk.Application application) {

            GLib.Object(application: application);