~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disobedience/control.c: Handle state-change toggles better.
[disorder]
/
lib
/
configuration.h
diff --git
a/lib/configuration.h
b/lib/configuration.h
index
3811b34
..
0fbf0bb
100644
(file)
--- a/
lib/configuration.h
+++ b/
lib/configuration.h
@@
-244,12
+244,15
@@
struct config {
/** @brief RTP buffer maximum size */
long rtp_maxbuffer;
/** @brief RTP buffer maximum size */
long rtp_maxbuffer;
- /* @brief RTP receive buffer size */
+ /*
*
@brief RTP receive buffer size */
long rtp_rcvbuf;
/** @brief Fixed RTP listening address */
struct netaddress rtp_request_address;
long rtp_rcvbuf;
/** @brief Fixed RTP listening address */
struct netaddress rtp_request_address;
+ /** @brief @c disorder-playrtp instance name (for naming sockets etc.) */
+ char *rtp_instance_name;
+
/** @brief Verbose RTP transmission logging */
int rtp_verbose;
/** @brief Verbose RTP transmission logging */
int rtp_verbose;
@@
-339,10
+342,6
@@
char *config_get_file(const char *name);
struct passwd;
struct passwd;
-char *config_userconf(const char *home, const struct passwd *pw);
-/* get the user's own private conffile, assuming their home dir is
- * @home@ if not null and using @pw@ otherwise */
-
char *config_usersysconf(const struct passwd *pw );
/* get the user's conffile in /etc */
char *config_usersysconf(const struct passwd *pw );
/* get the user's conffile in /etc */
@@
-353,7
+352,7
@@
int config_verify(void);
void config_free(struct config *c);
void config_free(struct config *c);
-extern char *configfile;
+extern char *configfile
, *userconfigfile
;
extern int config_per_user;
extern const struct uaudio *const *config_uaudio_apis;
extern int config_per_user;
extern const struct uaudio *const *config_uaudio_apis;