libsaria: Use a flags variable for initdata
I was using multiple boolean fields, but I think it'll be easier to set up a single bit-flag field instead. Signed-off-by: Bryan Schumaker <bjschuma@gmail.com>
This commit is contained in:
parent
aed5a023b3
commit
1ba1c72e3f
|
@ -3,14 +3,19 @@
|
|||
|
||||
#include <libsaria/track.h>
|
||||
|
||||
enum LibsariaFlags {
|
||||
LS_NONE = (0),
|
||||
LS_ENABLE_IDLE = (1 << 0),
|
||||
LS_ENABLE_PIPE = (1 << 1),
|
||||
};
|
||||
|
||||
namespace libsaria
|
||||
{
|
||||
struct initdata {
|
||||
int argc;
|
||||
char **argv;
|
||||
int flags;
|
||||
string name;
|
||||
bool enable_idle;
|
||||
bool enable_pipe;
|
||||
};
|
||||
|
||||
void init(struct initdata *);
|
||||
|
|
|
@ -24,7 +24,7 @@ namespace libsaria
|
|||
app::init(init->name);
|
||||
prefs::init();
|
||||
|
||||
if (init->enable_idle)
|
||||
if (init->flags & LS_ENABLE_IDLE)
|
||||
idle::enable();
|
||||
|
||||
audio::init(init->argc, init->argv);
|
||||
|
@ -32,7 +32,7 @@ namespace libsaria
|
|||
libsaria::library::init();
|
||||
libsaria::deck::load_all();
|
||||
|
||||
if (init->enable_pipe)
|
||||
if (init->flags & LS_ENABLE_PIPE)
|
||||
app::open_pipe();
|
||||
|
||||
}
|
||||
|
|
|
@ -101,9 +101,8 @@ int main(int argc, char **argv)
|
|||
struct libsaria::initdata ls_init = {
|
||||
argc,
|
||||
argv,
|
||||
LS_ENABLE_IDLE | LS_ENABLE_PIPE,
|
||||
"ocarina", /* app name */
|
||||
true, /* Use idle queue? */
|
||||
true, /* Use global pipe? */
|
||||
};
|
||||
println("Ocarina " + vers_str());
|
||||
find_lib_path();
|
||||
|
|
Loading…
Reference in New Issue
Block a user