← Back to branch summary

~ubuntu-branches/ubuntu/wily/pianobar/wily-proposed

« back to all changes in this revision

Viewing changes to src/settings.h

  • Committer: Bazaar Package Importer
  • Author(s): Luke Faraone
  • Date: 2011-07-09 10:03:03 UTC
  • mfrom: (1.3.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20110709100303-m5heshhcrbrv3w3n
Tags: 2011.07.09-1
http://bugs.debian.org/633345
https://launchpad.net/bugs/807860
* New upstream version. 
  - XMLRPC api version bump (v31) (closes: #633345, LP: #807860)
* Update debian/watch for new location.
* Update symbols file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/settings.h
1
1
/*
2
 
Copyright (c) 2008-2010
 
2
Copyright (c) 2008-2011
3
3
        Lars-Dominik Braun <lars@6xq.net>
4
4
 
5
5
Permission is hereby granted, free of charge, to any person obtaining a copy
27
27
#include <piano.h>
28
28
#include <waitress.h>
29
29
 
30
 
/* keep in mind that you have to update several arrays in main.c/ui_act.c too,
31
 
 * if you're adding new shortcuts */
 
30
/* update structure in ui_dispatch.h if you add shortcuts here */
32
31
typedef enum {
33
32
        BAR_KS_HELP = 0,
34
33
        BAR_KS_LOVE = 1,
54
53
        BAR_KS_BOOKMARK = 21,
55
54
        BAR_KS_VOLDOWN = 22,
56
55
        BAR_KS_VOLUP = 23,
 
56
        BAR_KS_MANAGESTATION = 24,
57
57
        /* insert new shortcuts _before_ this element and increase its value */
58
 
        BAR_KS_COUNT = 24,
 
58
        BAR_KS_COUNT = 25,
59
59
} BarKeyShortcutId_t;
60
60
 
 
61
#define BAR_KS_DISABLED '\x00'
 
62
 
61
63
typedef enum {
62
64
        BAR_SORT_NAME_AZ = 0,
63
65
        BAR_SORT_NAME_ZA = 1,
68
70
        BAR_SORT_COUNT = 6,
69
71
} BarStationSorting_t;
70
72
 
 
73
#include "ui_types.h"
 
74
 
 
75
typedef struct {
 
76
        char *prefix;
 
77
        char *postfix;
 
78
} BarMsgFormatStr_t;
 
79
 
71
80
typedef struct {
72
81
        unsigned int history;
73
82
        int volume;
82
91
        char *eventCmd;
83
92
        char *loveIcon;
84
93
        char *banIcon;
 
94
        char *npSongFormat;
 
95
        char *npStationFormat;
 
96
        BarMsgFormatStr_t msgFormat[MSG_COUNT];
85
97
} BarSettings_t;
86
98
 
87
99
void BarSettingsInit (BarSettings_t *);