Clang format, new standards

Author: domnpp

src/hotkey/api_hotkey.h

@@ -23,7 +23,7 @@
  *
  *  The Audacious team does not consider modular code linking to
  *  Audacious or using our public API to be a derived work.
-*/
+ */
 
 #ifndef _X_HOTKEY_H_INCLUDED
 #define _X_HOTKEY_H_INCLUDED
@@ -59,7 +59,8 @@ class Hotkey
     static void add_hotkey(HotkeyConfiguration ** pphotkey, OS_KeySym keysym,
                            int mask, int type, EVENT event);
     static void key_to_string(int key, char ** out_keytext);
-    static char* create_human_readable_keytext(const char* const keytext, int key, int mask);
+    static char * create_human_readable_keytext(const char * const keytext,
+                                                int key, int mask);
 };
 
 #ifndef _WIN32

src/hotkey/grab.h

@@ -23,7 +23,7 @@
  *
  *  The Audacious team does not consider modular code linking to
  *  Audacious or using our public API to be a derived work.
-*/
+ */
 
 #ifndef _GRAB_H_INCLUDED_
 #define _GRAB_H_INCLUDED_

src/hotkey/gui.cc

@@ -129,7 +129,8 @@ static gboolean on_entry_key_press_event(GtkWidget * widget,
 
     Hotkey::set_keytext(controls->keytext, is_mod ? 0 : event->hardware_keycode,
                         mod, TYPE_KEY);
-    // Returning TRUE indicates that the event has been handled, and that it should not propagate further.
+    // Returning TRUE indicates that the event has been handled, and that it
+    // should not propagate further.
     return true;
 }
 

src/hotkey/gui.h

@@ -23,7 +23,7 @@
  *
  *  The Audacious team does not consider modular code linking to
  *  Audacious or using our public API to be a derived work.
-*/
+ */
 
 #ifndef _GUI_H_INCLUDED_
 #define _GUI_H_INCLUDED_

src/hotkey/hotkey_api_common.cc

@@ -23,7 +23,7 @@
  *
  *  The Audacious team does not consider modular code linking to
  *  Audacious or using our public API to be a derived work.
-*/
+ */
 
 #include "api_hotkey.h"
 #include <X11/X.h>

src/hotkey/plugin.cc

@@ -47,10 +47,6 @@
 #include "grab.h"
 #include "gui.h"
 
-#ifdef BUILT_FROM_CMAKE
-#include "../../audacious-plugins_simpleAF/src/thirdparty/d_custom_logger.hpp"
-#endif
-
 extern bool system_up_and_running;
 
 class GlobalHotkeys : public GeneralPlugin
@@ -91,9 +87,6 @@ PluginConfig * get_config() { return &plugin_cfg_gtk_global_hk; }
  */
 bool GlobalHotkeys::init()
 {
-#ifdef BUILT_FROM_CMAKE
-    audlog::subscribe(&DCustomLogger::go, audlog::Level::Debug);
-#endif
     if (!gtk_init_check(nullptr, nullptr))
     {
         AUDERR("GTK+ initialization failed.\n");
@@ -305,19 +298,11 @@ void load_defaults()
     Hotkey::add_hotkey(&hotkey, OS_KEY_AudioStop, 0, TYPE_KEY, EVENT_STOP);
     Hotkey::add_hotkey(&hotkey, OS_KEY_AudioNext, 0, TYPE_KEY,
                        EVENT_NEXT_TRACK);
-
-    /*    add_hotkey(&hotkey, OS_KEY_AudioRewind, 0, TYPE_KEY, EVENT_BACKWARD);
-     */
-
     Hotkey::add_hotkey(&hotkey, OS_KEY_AudioMute, 0, TYPE_KEY, EVENT_MUTE);
     Hotkey::add_hotkey(&hotkey, OS_KEY_AudioRaiseVolume, 0, TYPE_KEY,
                        EVENT_VOL_UP);
     Hotkey::add_hotkey(&hotkey, OS_KEY_AudioLowerVolume, 0, TYPE_KEY,
                        EVENT_VOL_DOWN);
-
-    /*    add_hotkey(&hotkey, OS_KEY_AudioMedia, 0, TYPE_KEY,
-       EVENT_JUMP_TO_FILE); add_hotkey(&hotkey, XF86XK_Music, 0, TYPE_KEY,
-       EVENT_TOGGLE_WIN); */
 }
 
 /* load plugin configuration */
@@ -410,10 +395,6 @@ void GlobalHotkeys::cleanup()
 {
 #ifdef _WIN32
     system_up_and_running = false;
-#endif
-#ifdef BUILT_FROM_CMAKE
-    AUDWARN("Cleanup of globalHotkeys");
-    audlog::unsubscribe(&DCustomLogger::go);
 #endif
     HotkeyConfiguration * hotkey;
     ungrab_keys();

src/hotkey/x_hotkey.cc

@@ -23,7 +23,7 @@
  *
  *  The Audacious team does not consider modular code linking to
  *  Audacious or using our public API to be a derived work.
-*/
+ */
 
 #include <X11/X.h>
 #include <X11/XKBlib.h>
@@ -76,7 +76,8 @@ void Hotkey::key_to_string(int key, char ** out_keytext)
     }
 }
 
-char* Hotkey::create_human_readable_keytext(const char* const keytext, int key, int mask)
+char * Hotkey::create_human_readable_keytext(const char * const keytext,
+                                             int key, int mask)
 {
     static const constexpr unsigned int modifiers[] = {
         HK_CONTROL_MASK, HK_SHIFT_MASK, HK_MOD1_ALT_MASK, HK_MOD2_MASK,

src/hotkeyw32/w32_hotkey.cc

@@ -23,7 +23,7 @@
  *
  *  The Audacious team does not consider modular code linking to
  *  Audacious or using our public API to be a derived work.
-*/
+ */
 
 #include <src/hotkey/api_hotkey.h>
 
@@ -92,9 +92,6 @@ void Hotkey::add_hotkey(HotkeyConfiguration ** pphotkey,
     photkey = *pphotkey;
     if (photkey == nullptr)
         return;
-    // keycode =
-    // XKeysymToKeycode(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
-    // keysym); if (keycode == 0) return;
     if (photkey->key)
     {
         photkey->next = g_new(HotkeyConfiguration, 1);
@@ -119,54 +116,6 @@ void register_global_keys(HWND handle)
     }
 }
 
-// void assign(wchar_t *ptr_first_element, const wchar_t *text) {
-//  int loc = 0;
-//  while (text[loc]) {
-//    ptr_first_element[loc] = text[loc];
-//    ++loc;
-//  }
-//  ptr_first_element[loc] = 0;
-//}
-
-//HRESULT AddThumbarButtons(HWND hwnd)
-//{
-//    // Define an array of two buttons. These buttons provide images through an
-//    // image list and also provide tooltips.
-//    THUMBBUTTONMASK dwMask = THB_BITMAP | THB_TOOLTIP | THB_FLAGS;
-//
-//    /*
-//      THUMBBUTTONMASK dwMask;
-//      UINT iId;
-//      UINT iBitmap;
-//      HICON hIcon;
-//      WCHAR szTip[260];
-//      THUMBBUTTONFLAGS dwFlags;
-//      */
-//
-//    THUMBBUTTON btn[]{
-//        {dwMask, W_KEY_ID_PREV, 0, nullptr, L"Previous song", THBF_ENABLED},
-//        {dwMask, W_KEY_ID_PLAY, 0, nullptr, L"Play/pause", THBF_ENABLED},
-//        {dwMask, W_KEY_ID_NEXT, 0, nullptr, L"Next song", THBF_ENABLED}};
-//
-//    ITaskbarList3 * ptbl;
-//    HRESULT hr = CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER,
-//                                  IID_PPV_ARGS(&ptbl));
-//
-//    if (SUCCEEDED(hr))
-//    {
-//        // Declare the image list that contains the button images.
-//        // hr = ptbl->ThumbBarSetImageList(hwnd, himl);
-//
-//        if (SUCCEEDED(hr))
-//        {
-//            // Attach the toolbar to the thumbnail.
-//            hr = ptbl->ThumbBarAddButtons(hwnd, ARRAYSIZE(btn), btn);
-//        }
-//        ptbl->Release();
-//    }
-//    return hr;
-//}
-
 GdkFilterReturn w32_events_filter_first_everything(GdkXEvent * gdk_xevent,
                                                    GdkEvent * event,
                                                    gpointer user_data)
@@ -188,8 +137,7 @@ GdkFilterReturn w32_events_filter_first_everything(GdkXEvent * gdk_xevent,
                    (static_cast<std::string>(event_window)).c_str());
             if (event_window.is_main_window(true))
             {
-                event_window.
-                WindowsWindow::main_window_hidden_ = false;
+                event_window.WindowsWindow::main_window_hidden_ = false;
                 AUDDBG(
                     "TRANSFER EventReceivingWindow from %s to mainwindow HWND "
                     "%p",
@@ -200,32 +148,6 @@ GdkFilterReturn w32_events_filter_first_everything(GdkXEvent * gdk_xevent,
                 grab_keys_onto_window();
             }
         }
-        //        else
-        //        {
-        //            // leaving us.
-        //            AUDDBG("(GettingDown)FALSE %s; %s",
-        //                   stringify_win_evt(msg->message).c_str(),
-        //                   (static_cast<std::string>(event_window)).c_str());
-        //        }
-    }
-    //    else if (msg->message == WM_CLOSE)
-    //    {
-    //        auto event_window = WindowsWindow::get_window_data(msg->hwnd);
-    //        AUDDBG("%s: ; %s", stringify_win_evt(msg->message).c_str(),
-    //               (static_cast<std::string>(event_window)).c_str());
-    //    }
-    //    else if (msg->message == WM_CREATE)
-    //    {
-    //        auto event_window = WindowsWindow::get_window_data(msg->hwnd);
-    //        AUDDBG("%s: ; %s", stringify_win_evt(msg->message).c_str(),
-    //               (static_cast<std::string>(event_window)).c_str());
-    //    }
-    //    else if (msg->message == WM_DESTROY)
-    //    {
-    //        auto event_window = WindowsWindow::get_window_data(msg->hwnd);
-    //        AUDDBG("%s: ; %s", stringify_win_evt(msg->message).c_str(),
-    //               (static_cast<std::string>(event_window)).c_str());
-    //    }
     return GDK_FILTER_CONTINUE;
 }
 
@@ -310,50 +232,7 @@ void release_filter()
                              w32_evts_filter, nullptr);
     message_receiving_window = nullptr;
 }
-//
-// void main_window_created_from_statusbar(
-//    MainWindowSearchFilterData * const passed_data,
-//    WindowsWindow & created_main_window)
-//{
-//    // When window fully shows, must add windows buttons.
-//    gdk_window_remove_filter(
-//        reinterpret_cast<GdkWindow *>(passed_data->window_),
-//        reinterpret_cast<GdkFilterFunc>(passed_data->function_ptr_),
-//        passed_data);
-//    ungrab_keys();
-//    release_filter();
-//    delete passed_data;
-//}
-//
-// GdkFilterReturn main_window_missing_filter(GdkXEvent * gdk_xevent,
-//                                           GdkEvent * event, gpointer
-//                                           user_data)
-//{
-//    auto msg = reinterpret_cast<MSG *>(gdk_xevent);
-//    if (msg->message == WM_SHOWWINDOW && msg->wParam)
-//    {
-//        auto win_data = WindowsWindow::get_window_data(msg->hwnd);
-//        if (win_data.is_main_window())
-//        {
-//            main_window_created_from_statusbar(
-//                reinterpret_cast<MainWindowSearchFilterData *>(user_data),
-//                win_data);
-//        }
-//    }
-//    return GDK_FILTER_CONTINUE;
-//}
 
-/**
- * GSourceFunc:
- * @user_data: data passed to the function, set when the source was
- *     created with one of the above functions
- *
- * Specifies the type of function passed to g_timeout_add(),
- * g_timeout_add_full(), g_idle_add(), and g_idle_add_full().
- *
- * Returns: %FALSE if the source should be removed. #G_SOURCE_CONTINUE and
- * #G_SOURCE_REMOVE are more memorable names for the return value.
- */
 gboolean window_created_callback(gpointer user_data)
 {
     AUDDBG("Window created. Do real stuff.");
@@ -363,10 +242,7 @@ gboolean window_created_callback(gpointer user_data)
     return G_SOURCE_REMOVE;
 }
 
-void win_init()
-{
-    g_idle_add(&window_created_callback, nullptr);
-}
+void win_init() { g_idle_add(&window_created_callback, nullptr); }
 
 void Hotkey::key_to_string(int key, char ** out_keytext)
 {
@@ -375,7 +251,7 @@ void Hotkey::key_to_string(int key, char ** out_keytext)
     switch (key)
     {
     case VK_OEM_NEC_EQUAL:
-        // case VK_OEM_FJ_JISHO: (note: same as EQUAL)
+    // case VK_OEM_FJ_JISHO: (note: same as EQUAL)
     case VK_OEM_FJ_MASSHOU:
     case VK_OEM_FJ_TOUROKU:
     case VK_OEM_FJ_LOYA:

src/hotkeyw32/windows_key_str_map.h

@@ -23,7 +23,7 @@
  *
  *  The Audacious team does not consider modular code linking to
  *  Audacious or using our public API to be a derived work.
-*/
+ */
 
 #ifndef AUDACIOUS_PLUGINS_WINDOWS_KEY_STRINGS_HPP
 #define AUDACIOUS_PLUGINS_WINDOWS_KEY_STRINGS_HPP

src/hotkeyw32/windows_window.cc

@@ -23,7 +23,7 @@
  *
  *  The Audacious team does not consider modular code linking to
  *  Audacious or using our public API to be a derived work.
-*/
+ */
 
 #include "windows_window.h"