From 663a5d01b1931b97370ed8feff3ae229a9cc7ea4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 2 Jan 2021 14:02:44 +0100 Subject: Format all code with clang-format --- src/main.cpp | 177 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 88 insertions(+), 89 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index c677e01..499db30 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -15,14 +15,14 @@ */ #ifdef __APPLE__ -# include "binary_location.h" +# include "binary_location.h" -# include +# include -# include +# include -# include -# include +# include +# include #endif #include "Options.hpp" @@ -44,53 +44,53 @@ namespace { void set_bundle_environment() { - const std::string bundle = patchage::bundle_location(); - const std::string lib_path = bundle + "/lib"; - if (!Glib::file_test(lib_path, Glib::FILE_TEST_EXISTS)) { - // If lib does not exist, we have not been bundleified, do nothing - return; - } - - setenv("GTK_PATH", lib_path.c_str(), 1); - setenv("DYLD_LIBRARY_PATH", lib_path.c_str(), 1); - - const std::string pangorc_path(bundle + "/Resources/pangorc"); - if (Glib::file_test(pangorc_path, Glib::FILE_TEST_EXISTS)) { - setenv("PANGO_RC_FILE", pangorc_path.c_str(), 1); - } - - const std::string fonts_conf_path(bundle + "/Resources/fonts.conf"); - if (Glib::file_test(fonts_conf_path, Glib::FILE_TEST_EXISTS)) { - setenv("FONTCONFIG_FILE", fonts_conf_path.c_str(), 1); - } - - const std::string loaders_cache_path(bundle + "/Resources/loaders.cache"); - if (Glib::file_test(loaders_cache_path, Glib::FILE_TEST_EXISTS)) { - setenv("GDK_PIXBUF_MODULE_FILE", loaders_cache_path.c_str(), 1); - } - - const std::string gtkrc_path(bundle + "/Resources/gtkrc"); - if (Glib::file_test(gtkrc_path, Glib::FILE_TEST_EXISTS)) { - gtk_rc_parse(gtkrc_path.c_str()); - } + const std::string bundle = patchage::bundle_location(); + const std::string lib_path = bundle + "/lib"; + if (!Glib::file_test(lib_path, Glib::FILE_TEST_EXISTS)) { + // If lib does not exist, we have not been bundleified, do nothing + return; + } + + setenv("GTK_PATH", lib_path.c_str(), 1); + setenv("DYLD_LIBRARY_PATH", lib_path.c_str(), 1); + + const std::string pangorc_path(bundle + "/Resources/pangorc"); + if (Glib::file_test(pangorc_path, Glib::FILE_TEST_EXISTS)) { + setenv("PANGO_RC_FILE", pangorc_path.c_str(), 1); + } + + const std::string fonts_conf_path(bundle + "/Resources/fonts.conf"); + if (Glib::file_test(fonts_conf_path, Glib::FILE_TEST_EXISTS)) { + setenv("FONTCONFIG_FILE", fonts_conf_path.c_str(), 1); + } + + const std::string loaders_cache_path(bundle + "/Resources/loaders.cache"); + if (Glib::file_test(loaders_cache_path, Glib::FILE_TEST_EXISTS)) { + setenv("GDK_PIXBUF_MODULE_FILE", loaders_cache_path.c_str(), 1); + } + + const std::string gtkrc_path(bundle + "/Resources/gtkrc"); + if (Glib::file_test(gtkrc_path, Glib::FILE_TEST_EXISTS)) { + gtk_rc_parse(gtkrc_path.c_str()); + } } #endif void print_usage() { - std::cout << "Usage: patchage [OPTION]...\n"; - std::cout << "Visually connect JACK and ALSA Audio and MIDI ports.\n\n"; - std::cout << "Options:\n"; - std::cout << " -h, --help Display this help and exit.\n"; - std::cout << " -A, --no-alsa Do not automatically attach to ALSA.\n"; - std::cout << " -J, --no-jack Do not automatically attack to JACK.\n"; + std::cout << "Usage: patchage [OPTION]...\n"; + std::cout << "Visually connect JACK and ALSA Audio and MIDI ports.\n\n"; + std::cout << "Options:\n"; + std::cout << " -h, --help Display this help and exit.\n"; + std::cout << " -A, --no-alsa Do not automatically attach to ALSA.\n"; + std::cout << " -J, --no-jack Do not automatically attack to JACK.\n"; } void print_version() { - std::cout << "Patchage " PATCHAGE_VERSION << R"( + std::cout << "Patchage " PATCHAGE_VERSION << R"( Copyright 2007-2020 David Robillard . License GPLv3+: . This is free software: you are free to change and redistribute it. @@ -104,54 +104,53 @@ int main(int argc, char** argv) { #ifdef __APPLE__ - set_bundle_environment(); + set_bundle_environment(); #endif - try { - - Glib::thread_init(); - - Gtk::Main app(argc, argv); - ++argv; - --argc; - - // Parse command line options - patchage::Options options; - while (argc > 0) { - if (!strcmp(*argv, "-h") || !strcmp(*argv, "--help")) { - print_usage(); - return 0; - } - - if (!strcmp(*argv, "-A") || !strcmp(*argv, "--no-alsa")) { - options.alsa_driver_autoattach = false; - } else if (!strcmp(*argv, "-J") || !strcmp(*argv, "--no-jack")) { - options.jack_driver_autoattach = false; - } else if (!strcmp(*argv, "-V") || !strcmp(*argv, "--version")) { - print_version(); - return 0; - } else { - std::cerr << "patchage: invalid option -- '" << *argv << "'\n"; - print_usage(); - return 1; - } - - ++argv; - --argc; - } - - // Run until main loop is finished - patchage::Patchage patchage(options); - Gtk::Main::run(*patchage.window()); - patchage.save(); - - } catch (std::exception& e) { - std::cerr << "patchage: error: " << e.what() << std::endl; - return 1; - } catch (Glib::Exception& e) { - std::cerr << "patchage: error: " << e.what() << std::endl; - return 1; - } - - return 0; + try { + Glib::thread_init(); + + Gtk::Main app(argc, argv); + ++argv; + --argc; + + // Parse command line options + patchage::Options options; + while (argc > 0) { + if (!strcmp(*argv, "-h") || !strcmp(*argv, "--help")) { + print_usage(); + return 0; + } + + if (!strcmp(*argv, "-A") || !strcmp(*argv, "--no-alsa")) { + options.alsa_driver_autoattach = false; + } else if (!strcmp(*argv, "-J") || !strcmp(*argv, "--no-jack")) { + options.jack_driver_autoattach = false; + } else if (!strcmp(*argv, "-V") || !strcmp(*argv, "--version")) { + print_version(); + return 0; + } else { + std::cerr << "patchage: invalid option -- '" << *argv << "'\n"; + print_usage(); + return 1; + } + + ++argv; + --argc; + } + + // Run until main loop is finished + patchage::Patchage patchage(options); + Gtk::Main::run(*patchage.window()); + patchage.save(); + + } catch (std::exception& e) { + std::cerr << "patchage: error: " << e.what() << std::endl; + return 1; + } catch (Glib::Exception& e) { + std::cerr << "patchage: error: " << e.what() << std::endl; + return 1; + } + + return 0; } -- cgit v1.2.1