housekeeping: clang-format

Author: h0tw1r3

.clang-format

@@ -39,7 +39,7 @@ KeepEmptyLinesAtTheStartOfBlocks: true
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
+NamespaceIndentation: Inner
 ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true

src/ldp-out/hitachi.cpp

@@ -38,12 +38,12 @@
 // The 9550 uses a regular modem cable, NOT a null modem cable
 // Original command set by Robert DiNapoli
 
-#include "../timer/timer.h"
-#include "../io/serial.h"
-#include "../io/conout.h"
-#include "../hypseus.h"    // for get_quitflag
-#include "../game/game.h" // to get game FPS
 #include "hitachi.h"
+#include "../game/game.h" // to get game FPS
+#include "../hypseus.h"   // for get_quitflag
+#include "../io/conout.h"
+#include "../io/serial.h"
+#include "../timer/timer.h"
 
 // constructor
 hitachi::hitachi()
@@ -179,10 +179,9 @@ bool hitachi::skip_forward(Uint16 frames_to_skip, Uint16 target_frame)
     if (g_game->get_disc_fpks() != 29970) {
         printline("Hitachi: Disc is not standard 29.97 and therefore we must "
                   "convert the skip parameter");
-        frames_to_skip =
-            (Uint16)((1.25 * frames_to_skip) + 0.5); // to float multiplication
-                                                     // and add 0.5 to round to
-                                                     // the nearest whole number
+        // to float multiplication and add 0.5 to round to the nearest whole
+        // number
+        frames_to_skip = (Uint16)((1.25 * frames_to_skip) + 0.5);
     }
 
     framenum_to_frame(frames_to_skip, frame);

src/ldp-out/ld-v6000.cpp

@@ -23,15 +23,15 @@
 // File to control the Pioneer LD-V6000 series of players
 // written by Matt Ownby
 
-#include <string.h>
-#include <stdio.h>
-#include <plog/Log.h>
-#include "../io/serial.h"
-#include "../timer/timer.h"
-#include "../io/conout.h"
+#include "ld-v6000.h"
 #include "../hypseus.h"
+#include "../io/conout.h"
 #include "../io/input.h"
-#include "ld-v6000.h"
+#include "../io/serial.h"
+#include "../timer/timer.h"
+#include <plog/Log.h>
+#include <stdio.h>
+#include <string.h>
 
 // two-character codes that represent the digits 0 to 9
 const char *ldv6000_digits[10] = {"3F", "0F", "8F", "4F", "2F",

src/ldp-out/ldp-combo.cpp

@@ -26,8 +26,8 @@
 // a combo laserdisc player class that controls both smpeg and a real laserdisc
 // player
 
-#include "../timer/timer.h"
 #include "ldp-combo.h"
+#include "../timer/timer.h"
 
 combo::combo()
 {

src/ldp-out/ldp-combo.h

@@ -23,9 +23,9 @@
 // ldp-combo.h
 // by Matt Ownby
 
+#include "ldp-vldp.h"
 #include "ldp.h"
 #include "sony.h"
-#include "ldp-vldp.h"
 
 class combo : public ldp
 {

src/ldp-out/ldp-vldp-audio.cpp

@@ -30,20 +30,20 @@
 //(such as NTFS mounted from linux)
 #endif
 
-#include "../timer/timer.h"
+#include "ldp-vldp.h"
 #include "../io/conout.h"
 #include "../io/mpo_fileio.h"
 #include "../sound/sound.h"
-#include "ldp-vldp.h"
+#include "../timer/timer.h"
 
 #ifdef DEBUG
 #include <assert.h> // this may include an extra .DLL in windows that I don't want to rely on
 #endif
 
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
 #include <vorbis/codec.h> // OGG VORBIS specific headers
 #include <vorbis/vorbisfile.h>
@@ -100,8 +100,8 @@ void mmreset()
 size_t mmread(void *ptr, size_t size, size_t nmemb, void *datasource)
 {
     size_t bytes_to_read = size * nmemb; // how many bytes to be read
-    Uint8 *src           = ((Uint8 *)datasource) + g_audio_filepos; // where to get the
-                                                                    // data from
+    // where to get the data from
+    Uint8 *src = ((Uint8 *)datasource) + g_audio_filepos;
 
     //	printf("mmread being called.. size is %d, nmemb is %d, bytes_to_read is
     //%d\n", size, nmemb, bytes_to_read);
@@ -195,7 +195,7 @@ int mmclose(void *datasource)
 long mmtell(void *datasource)
 {
     //	printf("mmtell being called, filepos is %x\n", (Uint32)
-    //g_audio_filepos);
+    // g_audio_filepos);
 
     if (datasource) {
     }
@@ -522,7 +522,7 @@ void ldp_vldp_audio_callback(Uint8 *stream, int len, int unused)
     unsigned int uFloodTimer = (GET_TICKS() - g_uCallbackDbgTimer) / 1000;
     if (uFloodTimer != g_uCallbackFloodTimer) {
         g_uCallbackFloodTimer = uFloodTimer;
-        string s = "audio callback frequency is: " +
+        string s              = "audio callback frequency is: " +
                    numstr::ToStr((g_u64CallbackByteCount / uFloodTimer) >> 2);
         printline(s.c_str());
     }
@@ -618,22 +618,17 @@ void ldp_vldp_audio_callback(Uint8 *stream, int len, int unused)
             unsigned int cur_time = g_ldp->get_elapsed_ms_since_play();
             // if our timer is set to the current time or some previous time
             if (g_playing_timer < cur_time) {
-                static const Uint64 uBYTES_PER_S =
-                    sound::FREQ * sound::BYTES_PER_SAMPLE; // needs to be uint64
-                                                         // to prevent overflow
-                                                         // from subsequent math
+                // needs to be uint64 to prevent overflow from subsequent math
+                static const Uint64 uBYTES_PER_S = sound::FREQ * sound::BYTES_PER_SAMPLE;
+                // how many samples should have played 176.4 = 44.1 samples per
+                // millisecond * 2 for stereo * 2 for 16-bit
                 correct_samples =
                     (unsigned int)((uBYTES_PER_S * (cur_time - g_playing_timer)) / 1000);
-                // how many samples should have played
-                // 176.4 = 44.1 samples per millisecond * 2 for stereo * 2 for
-                // 16-bit
             }
             // our timer is set to some time in the future (used with skipping)
-            // so we actually
-            // should not have played any samples at this point
+            // so we actually should not have played any samples at this point
             else {
-                //				fprintf(stderr, "LDP-VLDP-AUDIO : Timer is in the
-                //future\n");
+                // fprintf(stderr, "LDP-VLDP-AUDIO : Timer is in the future\n");
                 correct_samples = 0;
             }