From 561652bc6a9f7c956d4afed15e6dff2d960edfee Mon Sep 17 00:00:00 2001 From: PedroEdiaz Date: Wed, 1 Oct 2025 12:43:37 -0600 Subject: [PATCH] Add clang-format and gitignore --- .clang-format | 15 ++++++++ .gitignore | 2 ++ Makefile | 6 ++++ cdplayer.c | 94 ++++++++++++++++++++++++--------------------------- 4 files changed, 67 insertions(+), 50 deletions(-) create mode 100644 .clang-format create mode 100644 .gitignore diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..816917a --- /dev/null +++ b/.clang-format @@ -0,0 +1,15 @@ +# Tabs +UseTab: ForContinuationAndIndentation #ForIndentation +# Sized +TabWidth: 8 +IndentWidth: 8 +ContinuationIndentWidth: 8 + +# Column Limit +ColumnLimit: 80 + +# Functions +AllowAllArgumentsOnNextLine: false + +# Allman +BreakBeforeBraces: Allman diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..737022a --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +cdplayer +cdplayer.o diff --git a/Makefile b/Makefile index f450b61..55e9ad2 100644 --- a/Makefile +++ b/Makefile @@ -9,3 +9,9 @@ CFLAGS = -Itinyalsa/include $(BIN): $(OBJ) $(CC) $(OBJ) -o $(BIN) + +fmt: + clang-format -i cdplayer.c + +clean: + rm $(BIN) $(OBJ) diff --git a/cdplayer.c b/cdplayer.c index cadb8bd..aae774a 100644 --- a/cdplayer.c +++ b/cdplayer.c @@ -1,9 +1,9 @@ -#include -#include +#include +#include #include #include -#include #include +#include #define FRAMES 1 @@ -13,66 +13,60 @@ struct cdrom_read_audio sr; -void forward( int signum ) -{ - sr.addr.lba+=3600; -} +void forward(int signum) { sr.addr.lba += 3600; } -void backward( int signum ) -{ - sr.addr.lba-=3600; -} +void backward(int signum) { sr.addr.lba -= 3600; } -void weite_err( char * s ) +void weite_err(char *s) { - char * p; - p=s; - while( *p ) + char *p; + p = s; + while (*p) ++p; - write( STDERR_FILENO, s, p-s ); + write(STDERR_FILENO, s, p - s); } -int main( int argc, char * argv[] ) +int main(int argc, char *argv[]) { - int fdi, card=0, device=0; - struct pcm * pcm; + int fdi, card = 0, device = 0; + struct pcm *pcm; struct pcm_config config; - char *msg, buff[SIZE*FRAMES]; + char *msg, buff[SIZE * FRAMES]; struct sigaction f_action, b_action; - if( argc < 2 ) + if (argc < 2) { - weite_err( "Usage: " ); - weite_err( argv[0] ); - weite_err( "cdrom [card=0] [device=0]\n" ); + weite_err("Usage: "); + weite_err(argv[0]); + weite_err("cdrom [card=0] [device=0]\n"); goto err0; } - if( (fdi=open( argv[1] , O_RDONLY | O_NONBLOCK )) < 0 ) + if ((fdi = open(argv[1], O_RDONLY | O_NONBLOCK)) < 0) { - weite_err( "couldn't open input device " ); - weite_err( argv[1] ); - weite_err( " \n" ); + weite_err("couldn't open input device "); + weite_err(argv[1]); + weite_err(" \n"); goto err0; } - switch( ioctl( fdi, CDROM_DRIVE_STATUS, 0 ) ) + switch (ioctl(fdi, CDROM_DRIVE_STATUS, 0)) { case CDS_NO_DISC: - weite_err( "No disk\n" ); + weite_err("No disk\n"); goto err1; case CDS_DRIVE_NOT_READY: - weite_err( "Drive not ready\n" ); + weite_err("Drive not ready\n"); goto err1; case CDS_TRAY_OPEN: - weite_err( "Tray open\n" ); + weite_err("Tray open\n"); goto err1; case -1: - weite_err( "Error\n" ); + weite_err("Error\n"); goto err1; } - switch( argc ) + switch (argc) { case 4: device = *argv[3] - '0'; @@ -82,13 +76,13 @@ int main( int argc, char * argv[] ) /* Prepare signals */ { - f_action.sa_handler = forward ; - b_action.sa_handler = backward ; + f_action.sa_handler = forward; + b_action.sa_handler = backward; - sigaddset( &f_action.sa_mask, SIGUSR1 ); - sigaddset( &b_action.sa_mask, SIGUSR2 ); - sigaction( SIGUSR1, &f_action, NULL ); - sigaction( SIGUSR2, &b_action, NULL ); + sigaddset(&f_action.sa_mask, SIGUSR1); + sigaddset(&b_action.sa_mask, SIGUSR2); + sigaction(SIGUSR1, &f_action, NULL); + sigaction(SIGUSR2, &b_action, NULL); } /* config pcm */ @@ -100,8 +94,8 @@ int main( int argc, char * argv[] ) config.period_size = PERIOD; config.period_count = COUNT; config.start_threshold = PERIOD; - config.silence_threshold = PERIOD*COUNT; - config.stop_threshold = PERIOD*COUNT; + config.silence_threshold = PERIOD * COUNT; + config.stop_threshold = PERIOD * COUNT; } /* config sr */ @@ -111,20 +105,20 @@ int main( int argc, char * argv[] ) sr.addr_format = CDROM_LBA; } - pcm = pcm_open( card, device, PCM_OUT , &config ); + pcm = pcm_open(card, device, PCM_OUT, &config); - sr.addr.lba=0; - while( ioctl( fdi, CDROMREADAUDIO, &sr ) != -1 ) + sr.addr.lba = 0; + while (ioctl(fdi, CDROMREADAUDIO, &sr) != -1) { - pcm_writei( pcm, buff, SIZE*FRAMES/4 ); - sr.addr.lba+=FRAMES; + pcm_writei(pcm, buff, SIZE * FRAMES / 4); + sr.addr.lba += FRAMES; } - pcm_close( pcm ); - close( fdi ); + pcm_close(pcm); + close(fdi); return 0; err1: - close( fdi ); + close(fdi); err0: return 1; }