eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

universal binaries on Mac, some cleanup, fix for click on Mac bundle for starting llcon

Browse source
This commit is contained in:
Volker Fischer 2010-03-12 20:25:30 +00:00
parent 425424b4ad
commit a36d36d015
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
llcon.pro
View file

@ -15,6 +15,7 @@ macx {
HEADERS += mac/sound.h HEADERS += mac/sound.h
SOURCES += mac/sound.cpp SOURCES += mac/sound.cpp
RC_FILE = mac/llcon.icns RC_FILE = mac/llcon.icns
CONFIG += x86 ppc
LIBS += -framework CoreFoundation \ LIBS += -framework CoreFoundation \
-framework CoreServices \ -framework CoreServices \

2
src/global.h
View file

@ -220,7 +220,7 @@ public:
/* Prototypes for global functions ********************************************/ /* Prototypes for global functions ********************************************/
// command line parsing, TODO do not declare functions globally but in a class // command line parsing, TODO do not declare functions globally but in a class
std::string UsageArguments ( char** argv ); std::string UsageArguments ( char** argv );
bool GetFlagArgument ( int argc, char** argv, int& i, std::string strShortOpt, std::string strLongOpt ); bool GetFlagArgument ( char** argv, int& i, std::string strShortOpt, std::string strLongOpt );
bool GetStringArgument ( int argc, char** argv, int& i, std::string strShortOpt, std::string strLongOpt, std::string& strArg ); bool GetStringArgument ( int argc, char** argv, int& i, std::string strShortOpt, std::string strLongOpt, std::string& strArg );
bool GetNumericArgument ( int argc, char** argv, int& i, std::string strShortOpt, std::string strLongOpt, double rRangeStart, double rRangeStop, double& rValue); bool GetNumericArgument ( int argc, char** argv, int& i, std::string strShortOpt, std::string strLongOpt, double rRangeStart, double rRangeStop, double& rValue);

15
src/main.cpp
View file

@ -62,7 +62,7 @@ int main ( int argc, char** argv )
for ( int i = 1; i < argc; i++ ) for ( int i = 1; i < argc; i++ )
{ {
// server mode flag ---------------------------------------------------- // server mode flag ----------------------------------------------------
if ( GetFlagArgument ( argc, argv, i, "-s", "--server" ) ) if ( GetFlagArgument ( argv, i, "-s", "--server" ) )
{ {
bIsClient = false; bIsClient = false;
cout << "- server mode chosen" << std::endl; cout << "- server mode chosen" << std::endl;
@ -71,7 +71,7 @@ int main ( int argc, char** argv )
// use GUI flag -------------------------------------------------------- // use GUI flag --------------------------------------------------------
if ( GetFlagArgument ( argc, argv, i, "-n", "--nogui" ) ) if ( GetFlagArgument ( argv, i, "-n", "--nogui" ) )
{ {
bUseGUI = false; bUseGUI = false;
cout << "- no GUI mode chosen" << std::endl; cout << "- no GUI mode chosen" << std::endl;
@ -80,7 +80,7 @@ int main ( int argc, char** argv )
// disable LEDs flag --------------------------------------------------- // disable LEDs flag ---------------------------------------------------
if ( GetFlagArgument ( argc, argv, i, "-d", "--disableleds" ) ) if ( GetFlagArgument ( argv, i, "-d", "--disableleds" ) )
{ {
bDisalbeLEDs = true; bDisalbeLEDs = true;
cout << "- disable LEDs in main window" << std::endl; cout << "- disable LEDs in main window" << std::endl;
@ -142,7 +142,7 @@ int main ( int argc, char** argv )
// connect on startup -------------------------------------------------- // connect on startup --------------------------------------------------
if ( GetFlagArgument ( argc, argv, i, "-c", "--connect" ) ) if ( GetFlagArgument ( argv, i, "-c", "--connect" ) )
{ {
bConnectOnStartup = true; bConnectOnStartup = true;
cout << "- connect on startup enabled" << std::endl; cout << "- connect on startup enabled" << std::endl;
@ -164,7 +164,11 @@ int main ( int argc, char** argv )
cerr << "Unknown option '" << argv[i] << "' -- use '--help' for help" cerr << "Unknown option '" << argv[i] << "' -- use '--help' for help"
<< endl; << endl;
// clicking on the Mac application bundle, the actual application
// is called with weird command line args -> do not exit on these
#if !( defined ( __APPLE__ ) || defined ( __MACOSX ) )
exit ( 1 ); exit ( 1 );
#endif
} }
// Application object // Application object
@ -317,8 +321,7 @@ std::string UsageArguments ( char **argv )
"Example: " + std::string ( argv[0] ) + " -l -inifile myinifile.ini\n"; "Example: " + std::string ( argv[0] ) + " -l -inifile myinifile.ini\n";
} }
bool GetFlagArgument ( int argc, bool GetFlagArgument ( char** argv,
char** argv,
int& i, int& i,
std::string strShortOpt, std::string strShortOpt,
std::string strLongOpt ) std::string strLongOpt )