Work/clang format#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petitlapin merged 3 commits into from
Dec 31, 2023
Merged

Work/clang format #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03e4e53
add clang-format
petitlapin Dec 31, 2023
be3f91c
clang-format all code
petitlapin Dec 31, 2023
e50a7ad
workflow for clang-format
petitlapin Dec 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .clang-format
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
---
Language: Cpp
BasedOnStyle: Webkit
PointerAlignment: Right
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: false
SortIncludes: false
AlignAfterOpenBracket: Align
BreakBeforeBraces: Custom
BraceWrapping:
BeforeElse: true
AfterFunction: true
AfterClass: true
AfterStruct: true
BreakConstructorInitializers: AfterColon
NamespaceIndentation: All
13 changes: 13 additions & 0 deletions .github/workflows/clang-format.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
name: clang-format Check
on: [push, pull_request]
jobs:
formatting-check:
name: Formatting Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Run clang-format style check for C/C++/Protobuf programs.
uses: jidicula/clang-format-action@v4.11.0
with:
clang-format-version: '16'
check-path: 'src'
239 changes: 127 additions & 112 deletions src/audio.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// (_||_/
// ( )
// ( )
// ( o 0 )
//-OOO°--(_)---°OOO---------------------------------------
// Copyright (C) 2006 By Dominique Roux-Serret
Expand DownExpand Up@@ -36,155 +36,170 @@ extern int Horloge;

/*** Constructeur et Destructeur ***/
/***********************************/
Audio::Audio(void) : N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{ }
Audio::Audio(void) :
N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{
}

Audio::~Audio(void)
{
if(N) {
Mix_HaltChannel(-1);
for(int i=0;i<N;i++)
if(Son[i]) Mix_FreeChunk(Son[i]);
delete [] Son;
}
Mix_CloseAudio();
if (N) {
Mix_HaltChannel(-1);
for (int i = 0; i < N; i++)
if (Son[i])
Mix_FreeChunk(Son[i]);
delete[] Son;
}
Mix_CloseAudio();
}

/*** Initialise l'Audio ***/
/**************************/
bool Audio::Init(void)
{
char PathFile[512];

if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
return false;
}
/*** Allocation de la mémoire ***/
N=sFin;
Son=new Mix_Chunk* [sFin];
/*** Chargement des sons ***/
strcpy(PathFile,"Sounds/clic.wav");
Utils::GetPath(PathFile);
Son[sClic]=Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/speed.wav");
Utils::GetPath(PathFile);
Son[sSpeed]=Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/crash.wav");
Utils::GetPath(PathFile);
Son[sCrash]=Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/end.wav");
Utils::GetPath(PathFile);
Son[sEnd]=Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/lose.wav");
Utils::GetPath(PathFile);
Son[sLose]=Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/etire.wav");
Utils::GetPath(PathFile);
Son[sEtire]=Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/wagon.wav");
Utils::GetPath(PathFile);
Son[sWagon]=Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/reduit.wav");
Utils::GetPath(PathFile);
Son[sReduit]=Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/live.wav");
Utils::GetPath(PathFile);
Son[sLive]=Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/menu.mod");
Utils::GetPath(PathFile);
Music=Mix_LoadMUS(PathFile);
return true;
char PathFile[512];

if (Mix_OpenAudio(22050,AUDIO_S16, 1, 1024)) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
return false;
}

/*** Allocation de la mémoire ***/
N = sFin;
Son = new Mix_Chunk *[sFin];

/*** Chargement des sons ***/
strcpy(PathFile,"Sounds/clic.wav");
Utils::GetPath(PathFile);
Son[sClic] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/speed.wav");
Utils::GetPath(PathFile);
Son[sSpeed] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/crash.wav");
Utils::GetPath(PathFile);
Son[sCrash] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/end.wav");
Utils::GetPath(PathFile);
Son[sEnd] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/lose.wav");
Utils::GetPath(PathFile);
Son[sLose] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/etire.wav");
Utils::GetPath(PathFile);
Son[sEtire] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/wagon.wav");
Utils::GetPath(PathFile);
Son[sWagon] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/reduit.wav");
Utils::GetPath(PathFile);
Son[sReduit] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/live.wav");
Utils::GetPath(PathFile);
Son[sLive] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/menu.mod");
Utils::GetPath(PathFile);
Music = Mix_LoadMUS(PathFile);

return true;
}

/*** Charge une music 0=menu 1,2,3,4 = game ***/
/**********************************************/
void Audio::LoadMusic(int Num)
{
char Provi[512]="Sounds/jeu1.xm";

if(!N) return;

NMus=Num;

if(Music) {
PauseMusic(true);
Mix_HaltMusic(); // Arrete la music
Mix_FreeMusic(Music);
Music=NULL;
}

if(Num==0) { // Si music du menu
strcpy(Provi,"Sounds/menu.mod");
Utils::GetPath(Provi);
Music=Mix_LoadMUS(Provi);
}
else {
Provi[10]=(char)(Num)+'0';
Utils::GetPath(Provi);
Music=Mix_LoadMUS(Provi);
}
PlayMusic();
char Provi[512] = "Sounds/jeu1.xm";

if (!N)
return;

NMus = Num;

if (Music) {
PauseMusic(true);
Mix_HaltMusic(); // Arrete la music
Mix_FreeMusic(Music);
Music = NULL;
}

if (Num == 0) { // Si music du menu
strcpy(Provi, "Sounds/menu.mod");
Utils::GetPath(Provi);
Music = Mix_LoadMUS(Provi);
}
else {
Provi[10] = (char)(Num) + '0';
Utils::GetPath(Provi);
Music = Mix_LoadMUS(Provi);
}
PlayMusic();
}

/*** Passe à la music de jeu suivante ***/
/****************************************/
void Audio::NextMusic(void)
{
NMus++;
if(NMus>2) NMus=1;
LoadMusic(NMus);
NMus++;
if (NMus > 2)
NMus = 1;
LoadMusic(NMus);
}

/*** Fait la lecture d'un son ***/
/********************************/
void Audio::Play(eSon So) {
if(!N) return;

if(So==sClic) {
if(Horloge-MemoHorloge<=120) return;
MemoHorloge=Horloge;
}

Mix_PlayChannel(-1,Son[So],0);
void Audio::Play(eSon So)
{
if (!N)
return;

if (So == sClic) {
if (Horloge - MemoHorloge <= 120)
return;
MemoHorloge = Horloge;
}

Mix_PlayChannel(-1, Son[So], 0);
}

/*** Joue la music ***/
/*********************/
void Audio::PlayMusic(void) {
if(Music && N) {
Mix_PlayMusic(Music,-1);
DoVolume();
}
void Audio::PlayMusic(void)
{
if (Music && N) {
Mix_PlayMusic(Music, -1);
DoVolume();
}
}

void Audio::PauseMusic(bool Et)
{
if(!N) return;
if (!N)
return;

if(Et) Mix_PauseMusic();
else Mix_ResumeMusic();
if (Et)
Mix_PauseMusic();
else
Mix_ResumeMusic();
}

/*** Valide les Volumes ***/
/**************************/
void Audio::DoVolume(void)
{
if(!N) return;

Mix_Volume(-1,(int)Pref.Volume);
if(NMus) Mix_VolumeMusic((int)Pref.VolumeM);
else Mix_VolumeMusic((int)Pref.VolumeM/2);
if (!N)
return;

Mix_Volume(-1, (int)Pref.Volume);
if (NMus)
Mix_VolumeMusic((int)Pref.VolumeM);
else
Mix_VolumeMusic((int)Pref.VolumeM / 2);
}
59 changes: 30 additions & 29 deletions src/audio.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,43 +29,44 @@
/*** Enumération des sons ***/
/****************************/
enum eSon {
sClic=0,
sSpeed,
sCrash,
sEnd,
sLose,
sEtire,
sWagon,
sReduit,
sLive,
sFin
sClic = 0,
sSpeed,
sCrash,
sEnd,
sLose,
sEtire,
sWagon,
sReduit,
sLive,
sFin
};

/*** Définition de la classe Audio ***/
/*************************************/
class Audio {
public:
Audio(void);
~Audio(void);
class Audio
{
public:
Audio(void);
~Audio(void);

/*** Fonctions ***/
bool Init(void); // Initialise et charge les fichiers audio
void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
void NextMusic(void); // Passe à la music suivante
/*** Fonctions ***/
bool Init(void); // Initialise et charge les fichiers audio
void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
void NextMusic(void); // Passe à la music suivante

void Play(eSon); // Joue un son
void PlayMusic(void); // Joue la music
void Play(eSon); // Joue un son
void PlayMusic(void); // Joue la music

void PauseMusic(bool Etat); // Met ou no la music en pause
void PauseMusic(bool Etat); // Met ou no la music en pause

void DoVolume(void); // Valide les volumes audio
/*** Variables ***/
int N; // Nombre d'échantillon audio
int NMus; // Numéro de la music en cours
int MemoHorloge; // Mémorise l'horloge pour les clics
Mix_Chunk **Son; // Pointe sur les sons
Mix_Music *Music; // Pointe sur les musics
void DoVolume(void); // Valide les volumes audio

/*** Variables ***/
int N; // Nombre d'échantillon audio
int NMus; // Numéro de la music en cours
int MemoHorloge; // Mémorise l'horloge pour les clics
Mix_Chunk **Son; // Pointe sur les sons
Mix_Music *Music; // Pointe sur les musics
};

#endif
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Work/clang format#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

petitlapin
merged 3 commits into

from

Dec 31, 2023
 Merged


Work/clang format
#18
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
03e4e53

add clang-format


petitlapin Dec 31, 2023
be3f91c

clang-format all code


petitlapin Dec 31, 2023
e50a7ad

workflow for clang-format


petitlapin Dec 31, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 16 additions & 0 deletions
.clang-format

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
---
Language: Cpp
BasedOnStyle: Webkit
PointerAlignment: Right
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: false
SortIncludes: false
AlignAfterOpenBracket: Align
BreakBeforeBraces: Custom
BraceWrapping:
 BeforeElse: true
 AfterFunction: true
 AfterClass: true
 AfterStruct: true
BreakConstructorInitializers: AfterColon
NamespaceIndentation: All

13 changes: 13 additions & 0 deletions
.github/workflows/clang-format.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
name: clang-format Check
on: [push, pull_request]
jobs:
 formatting-check:
 name: Formatting Check
 runs-on: ubuntu-latest
 steps:
 - uses: actions/checkout@v4
 - name: Run clang-format style check for C/C++/Protobuf programs.
 uses: jidicula/clang-format-action@v4.11.0
 with:
 clang-format-version: '16'
 check-path: 'src'

239 changes: 127 additions & 112 deletions
src/audio.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// (_||_/
// ( )
// ( )
// ( o 0 )
//-OOO°--(_)---°OOO---------------------------------------
// Copyright (C) 2006 By Dominique Roux-Serret
Expand DownExpand Up@@ -36,155 +36,170 @@ extern int Horloge;

/*** Constructeur et Destructeur ***/
/***********************************/
Audio::Audio(void) : N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{ }
Audio::Audio(void) :
 N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{
}

Audio::~Audio(void)
{
 if(N) {
 Mix_HaltChannel(-1);
 for(int i=0;i<N;i++) 
 if(Son[i]) Mix_FreeChunk(Son[i]);
 delete [] Son;
 }
 Mix_CloseAudio();
 if (N) {
 Mix_HaltChannel(-1);
 for (int i = 0; i < N; i++)
 if (Son[i])
 Mix_FreeChunk(Son[i]);
 delete[] Son;
 }
 Mix_CloseAudio();
}

/*** Initialise l'Audio ***/
/**************************/
bool Audio::Init(void)
{
 char PathFile[512];

if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) {
 SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
 return false;
 }
 /*** Allocation de la mémoire ***/
N=sFin;
 Son=new Mix_Chunk* [sFin];
 /*** Chargement des sons ***/
 strcpy(PathFile,"Sounds/clic.wav");
 Utils::GetPath(PathFile);
 Son[sClic]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/speed.wav");
 Utils::GetPath(PathFile);
 Son[sSpeed]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/crash.wav");
 Utils::GetPath(PathFile);
 Son[sCrash]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/end.wav");
 Utils::GetPath(PathFile);
 Son[sEnd]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/lose.wav");
 Utils::GetPath(PathFile);
 Son[sLose]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/etire.wav");
 Utils::GetPath(PathFile);
 Son[sEtire]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/wagon.wav");
 Utils::GetPath(PathFile);
 Son[sWagon]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/reduit.wav");
 Utils::GetPath(PathFile);
 Son[sReduit]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/live.wav");
 Utils::GetPath(PathFile);
 Son[sLive]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/menu.mod");
 Utils::GetPath(PathFile);
 Music=Mix_LoadMUS(PathFile);
 return true;
char PathFile[512];

 if (Mix_OpenAudio(22050,AUDIO_S16, 1, 1024)) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
return false;
}

/*** Allocation de la mémoire ***/
 N = sFin;
Son = new Mix_Chunk *[sFin];

/*** Chargement des sons ***/
strcpy(PathFile,"Sounds/clic.wav");
Utils::GetPath(PathFile);
Son[sClic] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/speed.wav");
Utils::GetPath(PathFile);
Son[sSpeed] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/crash.wav");
Utils::GetPath(PathFile);
Son[sCrash] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/end.wav");
Utils::GetPath(PathFile);
Son[sEnd] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/lose.wav");
Utils::GetPath(PathFile);
Son[sLose] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/etire.wav");
Utils::GetPath(PathFile);
Son[sEtire] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/wagon.wav");
Utils::GetPath(PathFile);
Son[sWagon] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/reduit.wav");
Utils::GetPath(PathFile);
Son[sReduit] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/live.wav");
Utils::GetPath(PathFile);
Son[sLive] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/menu.mod");
Utils::GetPath(PathFile);
Music = Mix_LoadMUS(PathFile);

return true;
}

/*** Charge une music 0=menu 1,2,3,4 = game ***/
/**********************************************/
void Audio::LoadMusic(int Num)
{
 char Provi[512]="Sounds/jeu1.xm";

 if(!N) return;

 NMus=Num;

 if(Music) {
 PauseMusic(true);
 Mix_HaltMusic(); // Arrete la music
 Mix_FreeMusic(Music);
 Music=NULL;
 }

 if(Num==0) { // Si music du menu
 strcpy(Provi,"Sounds/menu.mod");
 Utils::GetPath(Provi);
 Music=Mix_LoadMUS(Provi);
 }
 else {
 Provi[10]=(char)(Num)+'0';
 Utils::GetPath(Provi);
 Music=Mix_LoadMUS(Provi);
 }
 PlayMusic();
 char Provi[512] = "Sounds/jeu1.xm";

 if (!N)
 return;

 NMus = Num;

 if (Music) {
 PauseMusic(true);
 Mix_HaltMusic(); // Arrete la music
 Mix_FreeMusic(Music);
 Music = NULL;
 }

 if (Num == 0) { // Si music du menu
 strcpy(Provi, "Sounds/menu.mod");
 Utils::GetPath(Provi);
 Music = Mix_LoadMUS(Provi);
 }
 else {
 Provi[10] = (char)(Num) + '0';
 Utils::GetPath(Provi);
 Music = Mix_LoadMUS(Provi);
 }
 PlayMusic();
}

/*** Passe à la music de jeu suivante ***/
/****************************************/
void Audio::NextMusic(void)
{
 NMus++;
 if(NMus>2) NMus=1;
 LoadMusic(NMus);
 NMus++;
 if (NMus > 2)
 NMus = 1;
 LoadMusic(NMus);
}

/*** Fait la lecture d'un son ***/
/********************************/
void Audio::Play(eSon So) {
 if(!N) return;

 if(So==sClic) {
 if(Horloge-MemoHorloge<=120) return;
 MemoHorloge=Horloge;
 }

 Mix_PlayChannel(-1,Son[So],0);
void Audio::Play(eSon So)
{
 if (!N)
 return;

 if (So == sClic) {
 if (Horloge - MemoHorloge <= 120)
 return;
 MemoHorloge = Horloge;
 }

 Mix_PlayChannel(-1, Son[So], 0);
}

/*** Joue la music ***/
/*********************/
void Audio::PlayMusic(void) {
 if(Music && N) {
 Mix_PlayMusic(Music,-1);
 DoVolume();
 }
void Audio::PlayMusic(void)
{
 if (Music && N) {
 Mix_PlayMusic(Music, -1);
 DoVolume();
 }
}

void Audio::PauseMusic(bool Et)
{
 if(!N) return;
 if (!N)
 return;

 if(Et) Mix_PauseMusic();
 else Mix_ResumeMusic();
 if (Et)
 Mix_PauseMusic();
 else
 Mix_ResumeMusic();
}

/*** Valide les Volumes ***/
/**************************/
void Audio::DoVolume(void)
{
 if(!N) return;

 Mix_Volume(-1,(int)Pref.Volume);
 if(NMus) Mix_VolumeMusic((int)Pref.VolumeM);
 else Mix_VolumeMusic((int)Pref.VolumeM/2);
 if (!N)
 return;

 Mix_Volume(-1, (int)Pref.Volume);
 if (NMus)
 Mix_VolumeMusic((int)Pref.VolumeM);
 else
 Mix_VolumeMusic((int)Pref.VolumeM / 2);
}

59 changes: 30 additions & 29 deletions
src/audio.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,43 +29,44 @@
/*** Enumération des sons ***/
/****************************/
enum eSon {
 sClic=0,
 sSpeed,
 sCrash,
 sEnd,
 sLose,
 sEtire,
 sWagon,
 sReduit,
 sLive,
 sFin
sClic = 0,
sSpeed,
sCrash,
sEnd,
sLose,
sEtire,
sWagon,
sReduit,
sLive,
sFin
};

/*** Définition de la classe Audio ***/
/*************************************/
class Audio {
 public:
 Audio(void);
 ~Audio(void);
class Audio
{
public:
 Audio(void);
 ~Audio(void);

 /*** Fonctions ***/
 bool Init(void); // Initialise et charge les fichiers audio
 void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
 void NextMusic(void); // Passe à la music suivante
/*** Fonctions ***/
bool Init(void); // Initialise et charge les fichiers audio
void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
void NextMusic(void); // Passe à la music suivante

 void Play(eSon); // Joue un son
 void PlayMusic(void); // Joue la music
void Play(eSon); // Joue un son
void PlayMusic(void); // Joue la music

 void PauseMusic(bool Etat); // Met ou no la music en pause
void PauseMusic(bool Etat); // Met ou no la music en pause

 void DoVolume(void); // Valide les volumes audio
 /*** Variables ***/
 int N; // Nombre d'échantillon audio
 int NMus; // Numéro de la music en cours
 int MemoHorloge; // Mémorise l'horloge pour les clics
 Mix_Chunk **Son; // Pointe sur les sons
 Mix_Music *Music; // Pointe sur les musics
void DoVolume(void); // Valide les volumes audio

/*** Variables ***/
int N; // Nombre d'échantillon audio
int NMus; // Numéro de la music en cours
int MemoHorloge; // Mémorise l'horloge pour les clics
Mix_Chunk **Son; // Pointe sur les sons
Mix_Music *Music; // Pointe sur les musics
};

#endif
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Work/clang format#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

petitlapin
merged 3 commits into

from

Dec 31, 2023
 Merged


Work/clang format
#18
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
03e4e53

add clang-format


petitlapin Dec 31, 2023
be3f91c

clang-format all code


petitlapin Dec 31, 2023
e50a7ad

workflow for clang-format


petitlapin Dec 31, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 16 additions & 0 deletions
.clang-format

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
---
Language: Cpp
BasedOnStyle: Webkit
PointerAlignment: Right
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: false
SortIncludes: false
AlignAfterOpenBracket: Align
BreakBeforeBraces: Custom
BraceWrapping:
 BeforeElse: true
 AfterFunction: true
 AfterClass: true
 AfterStruct: true
BreakConstructorInitializers: AfterColon
NamespaceIndentation: All

13 changes: 13 additions & 0 deletions
.github/workflows/clang-format.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
name: clang-format Check
on: [push, pull_request]
jobs:
 formatting-check:
 name: Formatting Check
 runs-on: ubuntu-latest
 steps:
 - uses: actions/checkout@v4
 - name: Run clang-format style check for C/C++/Protobuf programs.
 uses: jidicula/clang-format-action@v4.11.0
 with:
 clang-format-version: '16'
 check-path: 'src'

239 changes: 127 additions & 112 deletions
src/audio.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// (_||_/
// ( )
// ( )
// ( o 0 )
//-OOO°--(_)---°OOO---------------------------------------
// Copyright (C) 2006 By Dominique Roux-Serret
Expand DownExpand Up@@ -36,155 +36,170 @@ extern int Horloge;

/*** Constructeur et Destructeur ***/
/***********************************/
Audio::Audio(void) : N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{ }
Audio::Audio(void) :
 N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{
}

Audio::~Audio(void)
{
 if(N) {
 Mix_HaltChannel(-1);
 for(int i=0;i<N;i++) 
 if(Son[i]) Mix_FreeChunk(Son[i]);
 delete [] Son;
 }
 Mix_CloseAudio();
 if (N) {
 Mix_HaltChannel(-1);
 for (int i = 0; i < N; i++)
 if (Son[i])
 Mix_FreeChunk(Son[i]);
 delete[] Son;
 }
 Mix_CloseAudio();
}

/*** Initialise l'Audio ***/
/**************************/
bool Audio::Init(void)
{
 char PathFile[512];

if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) {
 SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
 return false;
 }
 /*** Allocation de la mémoire ***/
N=sFin;
 Son=new Mix_Chunk* [sFin];
 /*** Chargement des sons ***/
 strcpy(PathFile,"Sounds/clic.wav");
 Utils::GetPath(PathFile);
 Son[sClic]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/speed.wav");
 Utils::GetPath(PathFile);
 Son[sSpeed]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/crash.wav");
 Utils::GetPath(PathFile);
 Son[sCrash]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/end.wav");
 Utils::GetPath(PathFile);
 Son[sEnd]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/lose.wav");
 Utils::GetPath(PathFile);
 Son[sLose]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/etire.wav");
 Utils::GetPath(PathFile);
 Son[sEtire]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/wagon.wav");
 Utils::GetPath(PathFile);
 Son[sWagon]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/reduit.wav");
 Utils::GetPath(PathFile);
 Son[sReduit]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/live.wav");
 Utils::GetPath(PathFile);
 Son[sLive]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/menu.mod");
 Utils::GetPath(PathFile);
 Music=Mix_LoadMUS(PathFile);
 return true;
char PathFile[512];

 if (Mix_OpenAudio(22050,AUDIO_S16, 1, 1024)) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
return false;
}

/*** Allocation de la mémoire ***/
 N = sFin;
Son = new Mix_Chunk *[sFin];

/*** Chargement des sons ***/
strcpy(PathFile,"Sounds/clic.wav");
Utils::GetPath(PathFile);
Son[sClic] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/speed.wav");
Utils::GetPath(PathFile);
Son[sSpeed] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/crash.wav");
Utils::GetPath(PathFile);
Son[sCrash] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/end.wav");
Utils::GetPath(PathFile);
Son[sEnd] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/lose.wav");
Utils::GetPath(PathFile);
Son[sLose] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/etire.wav");
Utils::GetPath(PathFile);
Son[sEtire] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/wagon.wav");
Utils::GetPath(PathFile);
Son[sWagon] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/reduit.wav");
Utils::GetPath(PathFile);
Son[sReduit] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/live.wav");
Utils::GetPath(PathFile);
Son[sLive] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/menu.mod");
Utils::GetPath(PathFile);
Music = Mix_LoadMUS(PathFile);

return true;
}

/*** Charge une music 0=menu 1,2,3,4 = game ***/
/**********************************************/
void Audio::LoadMusic(int Num)
{
 char Provi[512]="Sounds/jeu1.xm";

 if(!N) return;

 NMus=Num;

 if(Music) {
 PauseMusic(true);
 Mix_HaltMusic(); // Arrete la music
 Mix_FreeMusic(Music);
 Music=NULL;
 }

 if(Num==0) { // Si music du menu
 strcpy(Provi,"Sounds/menu.mod");
 Utils::GetPath(Provi);
 Music=Mix_LoadMUS(Provi);
 }
 else {
 Provi[10]=(char)(Num)+'0';
 Utils::GetPath(Provi);
 Music=Mix_LoadMUS(Provi);
 }
 PlayMusic();
 char Provi[512] = "Sounds/jeu1.xm";

 if (!N)
 return;

 NMus = Num;

 if (Music) {
 PauseMusic(true);
 Mix_HaltMusic(); // Arrete la music
 Mix_FreeMusic(Music);
 Music = NULL;
 }

 if (Num == 0) { // Si music du menu
 strcpy(Provi, "Sounds/menu.mod");
 Utils::GetPath(Provi);
 Music = Mix_LoadMUS(Provi);
 }
 else {
 Provi[10] = (char)(Num) + '0';
 Utils::GetPath(Provi);
 Music = Mix_LoadMUS(Provi);
 }
 PlayMusic();
}

/*** Passe à la music de jeu suivante ***/
/****************************************/
void Audio::NextMusic(void)
{
 NMus++;
 if(NMus>2) NMus=1;
 LoadMusic(NMus);
 NMus++;
 if (NMus > 2)
 NMus = 1;
 LoadMusic(NMus);
}

/*** Fait la lecture d'un son ***/
/********************************/
void Audio::Play(eSon So) {
 if(!N) return;

 if(So==sClic) {
 if(Horloge-MemoHorloge<=120) return;
 MemoHorloge=Horloge;
 }

 Mix_PlayChannel(-1,Son[So],0);
void Audio::Play(eSon So)
{
 if (!N)
 return;

 if (So == sClic) {
 if (Horloge - MemoHorloge <= 120)
 return;
 MemoHorloge = Horloge;
 }

 Mix_PlayChannel(-1, Son[So], 0);
}

/*** Joue la music ***/
/*********************/
void Audio::PlayMusic(void) {
 if(Music && N) {
 Mix_PlayMusic(Music,-1);
 DoVolume();
 }
void Audio::PlayMusic(void)
{
 if (Music && N) {
 Mix_PlayMusic(Music, -1);
 DoVolume();
 }
}

void Audio::PauseMusic(bool Et)
{
 if(!N) return;
 if (!N)
 return;

 if(Et) Mix_PauseMusic();
 else Mix_ResumeMusic();
 if (Et)
 Mix_PauseMusic();
 else
 Mix_ResumeMusic();
}

/*** Valide les Volumes ***/
/**************************/
void Audio::DoVolume(void)
{
 if(!N) return;

 Mix_Volume(-1,(int)Pref.Volume);
 if(NMus) Mix_VolumeMusic((int)Pref.VolumeM);
 else Mix_VolumeMusic((int)Pref.VolumeM/2);
 if (!N)
 return;

 Mix_Volume(-1, (int)Pref.Volume);
 if (NMus)
 Mix_VolumeMusic((int)Pref.VolumeM);
 else
 Mix_VolumeMusic((int)Pref.VolumeM / 2);
}

59 changes: 30 additions & 29 deletions
src/audio.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,43 +29,44 @@
/*** Enumération des sons ***/
/****************************/
enum eSon {
 sClic=0,
 sSpeed,
 sCrash,
 sEnd,
 sLose,
 sEtire,
 sWagon,
 sReduit,
 sLive,
 sFin
sClic = 0,
sSpeed,
sCrash,
sEnd,
sLose,
sEtire,
sWagon,
sReduit,
sLive,
sFin
};

/*** Définition de la classe Audio ***/
/*************************************/
class Audio {
 public:
 Audio(void);
 ~Audio(void);
class Audio
{
public:
 Audio(void);
 ~Audio(void);

 /*** Fonctions ***/
 bool Init(void); // Initialise et charge les fichiers audio
 void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
 void NextMusic(void); // Passe à la music suivante
/*** Fonctions ***/
bool Init(void); // Initialise et charge les fichiers audio
void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
void NextMusic(void); // Passe à la music suivante

 void Play(eSon); // Joue un son
 void PlayMusic(void); // Joue la music
void Play(eSon); // Joue un son
void PlayMusic(void); // Joue la music

 void PauseMusic(bool Etat); // Met ou no la music en pause
void PauseMusic(bool Etat); // Met ou no la music en pause

 void DoVolume(void); // Valide les volumes audio
 /*** Variables ***/
 int N; // Nombre d'échantillon audio
 int NMus; // Numéro de la music en cours
 int MemoHorloge; // Mémorise l'horloge pour les clics
 Mix_Chunk **Son; // Pointe sur les sons
 Mix_Music *Music; // Pointe sur les musics
void DoVolume(void); // Valide les volumes audio

/*** Variables ***/
int N; // Nombre d'échantillon audio
int NMus; // Numéro de la music en cours
int MemoHorloge; // Mémorise l'horloge pour les clics
Mix_Chunk **Son; // Pointe sur les sons
Mix_Music *Music; // Pointe sur les musics
};

#endif
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Work/clang format#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

petitlapin
merged 3 commits into

from

Dec 31, 2023
 Merged


Work/clang format
#18
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
03e4e53

add clang-format


petitlapin Dec 31, 2023
be3f91c

clang-format all code


petitlapin Dec 31, 2023
e50a7ad

workflow for clang-format


petitlapin Dec 31, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 16 additions & 0 deletions
.clang-format

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
---
Language: Cpp
BasedOnStyle: Webkit
PointerAlignment: Right
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: false
SortIncludes: false
AlignAfterOpenBracket: Align
BreakBeforeBraces: Custom
BraceWrapping:
 BeforeElse: true
 AfterFunction: true
 AfterClass: true
 AfterStruct: true
BreakConstructorInitializers: AfterColon
NamespaceIndentation: All

13 changes: 13 additions & 0 deletions
.github/workflows/clang-format.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
name: clang-format Check
on: [push, pull_request]
jobs:
 formatting-check:
 name: Formatting Check
 runs-on: ubuntu-latest
 steps:
 - uses: actions/checkout@v4
 - name: Run clang-format style check for C/C++/Protobuf programs.
 uses: jidicula/clang-format-action@v4.11.0
 with:
 clang-format-version: '16'
 check-path: 'src'

239 changes: 127 additions & 112 deletions
src/audio.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// (_||_/
// ( )
// ( )
// ( o 0 )
//-OOO°--(_)---°OOO---------------------------------------
// Copyright (C) 2006 By Dominique Roux-Serret
Expand DownExpand Up@@ -36,155 +36,170 @@ extern int Horloge;

/*** Constructeur et Destructeur ***/
/***********************************/
Audio::Audio(void) : N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{ }
Audio::Audio(void) :
 N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{
}

Audio::~Audio(void)
{
 if(N) {
 Mix_HaltChannel(-1);
 for(int i=0;i<N;i++) 
 if(Son[i]) Mix_FreeChunk(Son[i]);
 delete [] Son;
 }
 Mix_CloseAudio();
 if (N) {
 Mix_HaltChannel(-1);
 for (int i = 0; i < N; i++)
 if (Son[i])
 Mix_FreeChunk(Son[i]);
 delete[] Son;
 }
 Mix_CloseAudio();
}

/*** Initialise l'Audio ***/
/**************************/
bool Audio::Init(void)
{
 char PathFile[512];

if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) {
 SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
 return false;
 }
 /*** Allocation de la mémoire ***/
N=sFin;
 Son=new Mix_Chunk* [sFin];
 /*** Chargement des sons ***/
 strcpy(PathFile,"Sounds/clic.wav");
 Utils::GetPath(PathFile);
 Son[sClic]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/speed.wav");
 Utils::GetPath(PathFile);
 Son[sSpeed]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/crash.wav");
 Utils::GetPath(PathFile);
 Son[sCrash]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/end.wav");
 Utils::GetPath(PathFile);
 Son[sEnd]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/lose.wav");
 Utils::GetPath(PathFile);
 Son[sLose]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/etire.wav");
 Utils::GetPath(PathFile);
 Son[sEtire]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/wagon.wav");
 Utils::GetPath(PathFile);
 Son[sWagon]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/reduit.wav");
 Utils::GetPath(PathFile);
 Son[sReduit]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/live.wav");
 Utils::GetPath(PathFile);
 Son[sLive]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/menu.mod");
 Utils::GetPath(PathFile);
 Music=Mix_LoadMUS(PathFile);
 return true;
char PathFile[512];

 if (Mix_OpenAudio(22050,AUDIO_S16, 1, 1024)) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
return false;
}

/*** Allocation de la mémoire ***/
 N = sFin;
Son = new Mix_Chunk *[sFin];

/*** Chargement des sons ***/
strcpy(PathFile,"Sounds/clic.wav");
Utils::GetPath(PathFile);
Son[sClic] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/speed.wav");
Utils::GetPath(PathFile);
Son[sSpeed] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/crash.wav");
Utils::GetPath(PathFile);
Son[sCrash] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/end.wav");
Utils::GetPath(PathFile);
Son[sEnd] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/lose.wav");
Utils::GetPath(PathFile);
Son[sLose] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/etire.wav");
Utils::GetPath(PathFile);
Son[sEtire] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/wagon.wav");
Utils::GetPath(PathFile);
Son[sWagon] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/reduit.wav");
Utils::GetPath(PathFile);
Son[sReduit] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/live.wav");
Utils::GetPath(PathFile);
Son[sLive] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/menu.mod");
Utils::GetPath(PathFile);
Music = Mix_LoadMUS(PathFile);

return true;
}

/*** Charge une music 0=menu 1,2,3,4 = game ***/
/**********************************************/
void Audio::LoadMusic(int Num)
{
 char Provi[512]="Sounds/jeu1.xm";

 if(!N) return;

 NMus=Num;

 if(Music) {
 PauseMusic(true);
 Mix_HaltMusic(); // Arrete la music
 Mix_FreeMusic(Music);
 Music=NULL;
 }

 if(Num==0) { // Si music du menu
 strcpy(Provi,"Sounds/menu.mod");
 Utils::GetPath(Provi);
 Music=Mix_LoadMUS(Provi);
 }
 else {
 Provi[10]=(char)(Num)+'0';
 Utils::GetPath(Provi);
 Music=Mix_LoadMUS(Provi);
 }
 PlayMusic();
 char Provi[512] = "Sounds/jeu1.xm";

 if (!N)
 return;

 NMus = Num;

 if (Music) {
 PauseMusic(true);
 Mix_HaltMusic(); // Arrete la music
 Mix_FreeMusic(Music);
 Music = NULL;
 }

 if (Num == 0) { // Si music du menu
 strcpy(Provi, "Sounds/menu.mod");
 Utils::GetPath(Provi);
 Music = Mix_LoadMUS(Provi);
 }
 else {
 Provi[10] = (char)(Num) + '0';
 Utils::GetPath(Provi);
 Music = Mix_LoadMUS(Provi);
 }
 PlayMusic();
}

/*** Passe à la music de jeu suivante ***/
/****************************************/
void Audio::NextMusic(void)
{
 NMus++;
 if(NMus>2) NMus=1;
 LoadMusic(NMus);
 NMus++;
 if (NMus > 2)
 NMus = 1;
 LoadMusic(NMus);
}

/*** Fait la lecture d'un son ***/
/********************************/
void Audio::Play(eSon So) {
 if(!N) return;

 if(So==sClic) {
 if(Horloge-MemoHorloge<=120) return;
 MemoHorloge=Horloge;
 }

 Mix_PlayChannel(-1,Son[So],0);
void Audio::Play(eSon So)
{
 if (!N)
 return;

 if (So == sClic) {
 if (Horloge - MemoHorloge <= 120)
 return;
 MemoHorloge = Horloge;
 }

 Mix_PlayChannel(-1, Son[So], 0);
}

/*** Joue la music ***/
/*********************/
void Audio::PlayMusic(void) {
 if(Music && N) {
 Mix_PlayMusic(Music,-1);
 DoVolume();
 }
void Audio::PlayMusic(void)
{
 if (Music && N) {
 Mix_PlayMusic(Music, -1);
 DoVolume();
 }
}

void Audio::PauseMusic(bool Et)
{
 if(!N) return;
 if (!N)
 return;

 if(Et) Mix_PauseMusic();
 else Mix_ResumeMusic();
 if (Et)
 Mix_PauseMusic();
 else
 Mix_ResumeMusic();
}

/*** Valide les Volumes ***/
/**************************/
void Audio::DoVolume(void)
{
 if(!N) return;

 Mix_Volume(-1,(int)Pref.Volume);
 if(NMus) Mix_VolumeMusic((int)Pref.VolumeM);
 else Mix_VolumeMusic((int)Pref.VolumeM/2);
 if (!N)
 return;

 Mix_Volume(-1, (int)Pref.Volume);
 if (NMus)
 Mix_VolumeMusic((int)Pref.VolumeM);
 else
 Mix_VolumeMusic((int)Pref.VolumeM / 2);
}

59 changes: 30 additions & 29 deletions
src/audio.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,43 +29,44 @@
/*** Enumération des sons ***/
/****************************/
enum eSon {
 sClic=0,
 sSpeed,
 sCrash,
 sEnd,
 sLose,
 sEtire,
 sWagon,
 sReduit,
 sLive,
 sFin
sClic = 0,
sSpeed,
sCrash,
sEnd,
sLose,
sEtire,
sWagon,
sReduit,
sLive,
sFin
};

/*** Définition de la classe Audio ***/
/*************************************/
class Audio {
 public:
 Audio(void);
 ~Audio(void);
class Audio
{
public:
 Audio(void);
 ~Audio(void);

 /*** Fonctions ***/
 bool Init(void); // Initialise et charge les fichiers audio
 void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
 void NextMusic(void); // Passe à la music suivante
/*** Fonctions ***/
bool Init(void); // Initialise et charge les fichiers audio
void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
void NextMusic(void); // Passe à la music suivante

 void Play(eSon); // Joue un son
 void PlayMusic(void); // Joue la music
void Play(eSon); // Joue un son
void PlayMusic(void); // Joue la music

 void PauseMusic(bool Etat); // Met ou no la music en pause
void PauseMusic(bool Etat); // Met ou no la music en pause

 void DoVolume(void); // Valide les volumes audio
 /*** Variables ***/
 int N; // Nombre d'échantillon audio
 int NMus; // Numéro de la music en cours
 int MemoHorloge; // Mémorise l'horloge pour les clics
 Mix_Chunk **Son; // Pointe sur les sons
 Mix_Music *Music; // Pointe sur les musics
void DoVolume(void); // Valide les volumes audio

/*** Variables ***/
int N; // Nombre d'échantillon audio
int NMus; // Numéro de la music en cours
int MemoHorloge; // Mémorise l'horloge pour les clics
Mix_Chunk **Son; // Pointe sur les sons
Mix_Music *Music; // Pointe sur les musics
};

#endif
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Work/clang format#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

petitlapin
merged 3 commits into

from

Dec 31, 2023
 Merged


Work/clang format
#18
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
03e4e53

add clang-format


petitlapin Dec 31, 2023
be3f91c

clang-format all code


petitlapin Dec 31, 2023
e50a7ad

workflow for clang-format


petitlapin Dec 31, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 16 additions & 0 deletions
.clang-format

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
---
Language: Cpp
BasedOnStyle: Webkit
PointerAlignment: Right
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: false
SortIncludes: false
AlignAfterOpenBracket: Align
BreakBeforeBraces: Custom
BraceWrapping:
 BeforeElse: true
 AfterFunction: true
 AfterClass: true
 AfterStruct: true
BreakConstructorInitializers: AfterColon
NamespaceIndentation: All

13 changes: 13 additions & 0 deletions
.github/workflows/clang-format.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
name: clang-format Check
on: [push, pull_request]
jobs:
 formatting-check:
 name: Formatting Check
 runs-on: ubuntu-latest
 steps:
 - uses: actions/checkout@v4
 - name: Run clang-format style check for C/C++/Protobuf programs.
 uses: jidicula/clang-format-action@v4.11.0
 with:
 clang-format-version: '16'
 check-path: 'src'

239 changes: 127 additions & 112 deletions
src/audio.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// (_||_/
// ( )
// ( )
// ( o 0 )
//-OOO°--(_)---°OOO---------------------------------------
// Copyright (C) 2006 By Dominique Roux-Serret
Expand DownExpand Up@@ -36,155 +36,170 @@ extern int Horloge;

/*** Constructeur et Destructeur ***/
/***********************************/
Audio::Audio(void) : N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{ }
Audio::Audio(void) :
 N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{
}

Audio::~Audio(void)
{
 if(N) {
 Mix_HaltChannel(-1);
 for(int i=0;i<N;i++) 
 if(Son[i]) Mix_FreeChunk(Son[i]);
 delete [] Son;
 }
 Mix_CloseAudio();
 if (N) {
 Mix_HaltChannel(-1);
 for (int i = 0; i < N; i++)
 if (Son[i])
 Mix_FreeChunk(Son[i]);
 delete[] Son;
 }
 Mix_CloseAudio();
}

/*** Initialise l'Audio ***/
/**************************/
bool Audio::Init(void)
{
 char PathFile[512];

if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) {
 SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
 return false;
 }
 /*** Allocation de la mémoire ***/
N=sFin;
 Son=new Mix_Chunk* [sFin];
 /*** Chargement des sons ***/
 strcpy(PathFile,"Sounds/clic.wav");
 Utils::GetPath(PathFile);
 Son[sClic]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/speed.wav");
 Utils::GetPath(PathFile);
 Son[sSpeed]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/crash.wav");
 Utils::GetPath(PathFile);
 Son[sCrash]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/end.wav");
 Utils::GetPath(PathFile);
 Son[sEnd]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/lose.wav");
 Utils::GetPath(PathFile);
 Son[sLose]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/etire.wav");
 Utils::GetPath(PathFile);
 Son[sEtire]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/wagon.wav");
 Utils::GetPath(PathFile);
 Son[sWagon]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/reduit.wav");
 Utils::GetPath(PathFile);
 Son[sReduit]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/live.wav");
 Utils::GetPath(PathFile);
 Son[sLive]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/menu.mod");
 Utils::GetPath(PathFile);
 Music=Mix_LoadMUS(PathFile);
 return true;
char PathFile[512];

 if (Mix_OpenAudio(22050,AUDIO_S16, 1, 1024)) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
return false;
}

/*** Allocation de la mémoire ***/
 N = sFin;
Son = new Mix_Chunk *[sFin];

/*** Chargement des sons ***/
strcpy(PathFile,"Sounds/clic.wav");
Utils::GetPath(PathFile);
Son[sClic] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/speed.wav");
Utils::GetPath(PathFile);
Son[sSpeed] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/crash.wav");
Utils::GetPath(PathFile);
Son[sCrash] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/end.wav");
Utils::GetPath(PathFile);
Son[sEnd] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/lose.wav");
Utils::GetPath(PathFile);
Son[sLose] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/etire.wav");
Utils::GetPath(PathFile);
Son[sEtire] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/wagon.wav");
Utils::GetPath(PathFile);
Son[sWagon] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/reduit.wav");
Utils::GetPath(PathFile);
Son[sReduit] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/live.wav");
Utils::GetPath(PathFile);
Son[sLive] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/menu.mod");
Utils::GetPath(PathFile);
Music = Mix_LoadMUS(PathFile);

return true;
}

/*** Charge une music 0=menu 1,2,3,4 = game ***/
/**********************************************/
void Audio::LoadMusic(int Num)
{
 char Provi[512]="Sounds/jeu1.xm";

 if(!N) return;

 NMus=Num;

 if(Music) {
 PauseMusic(true);
 Mix_HaltMusic(); // Arrete la music
 Mix_FreeMusic(Music);
 Music=NULL;
 }

 if(Num==0) { // Si music du menu
 strcpy(Provi,"Sounds/menu.mod");
 Utils::GetPath(Provi);
 Music=Mix_LoadMUS(Provi);
 }
 else {
 Provi[10]=(char)(Num)+'0';
 Utils::GetPath(Provi);
 Music=Mix_LoadMUS(Provi);
 }
 PlayMusic();
 char Provi[512] = "Sounds/jeu1.xm";

 if (!N)
 return;

 NMus = Num;

 if (Music) {
 PauseMusic(true);
 Mix_HaltMusic(); // Arrete la music
 Mix_FreeMusic(Music);
 Music = NULL;
 }

 if (Num == 0) { // Si music du menu
 strcpy(Provi, "Sounds/menu.mod");
 Utils::GetPath(Provi);
 Music = Mix_LoadMUS(Provi);
 }
 else {
 Provi[10] = (char)(Num) + '0';
 Utils::GetPath(Provi);
 Music = Mix_LoadMUS(Provi);
 }
 PlayMusic();
}

/*** Passe à la music de jeu suivante ***/
/****************************************/
void Audio::NextMusic(void)
{
 NMus++;
 if(NMus>2) NMus=1;
 LoadMusic(NMus);
 NMus++;
 if (NMus > 2)
 NMus = 1;
 LoadMusic(NMus);
}

/*** Fait la lecture d'un son ***/
/********************************/
void Audio::Play(eSon So) {
 if(!N) return;

 if(So==sClic) {
 if(Horloge-MemoHorloge<=120) return;
 MemoHorloge=Horloge;
 }

 Mix_PlayChannel(-1,Son[So],0);
void Audio::Play(eSon So)
{
 if (!N)
 return;

 if (So == sClic) {
 if (Horloge - MemoHorloge <= 120)
 return;
 MemoHorloge = Horloge;
 }

 Mix_PlayChannel(-1, Son[So], 0);
}

/*** Joue la music ***/
/*********************/
void Audio::PlayMusic(void) {
 if(Music && N) {
 Mix_PlayMusic(Music,-1);
 DoVolume();
 }
void Audio::PlayMusic(void)
{
 if (Music && N) {
 Mix_PlayMusic(Music, -1);
 DoVolume();
 }
}

void Audio::PauseMusic(bool Et)
{
 if(!N) return;
 if (!N)
 return;

 if(Et) Mix_PauseMusic();
 else Mix_ResumeMusic();
 if (Et)
 Mix_PauseMusic();
 else
 Mix_ResumeMusic();
}

/*** Valide les Volumes ***/
/**************************/
void Audio::DoVolume(void)
{
 if(!N) return;

 Mix_Volume(-1,(int)Pref.Volume);
 if(NMus) Mix_VolumeMusic((int)Pref.VolumeM);
 else Mix_VolumeMusic((int)Pref.VolumeM/2);
 if (!N)
 return;

 Mix_Volume(-1, (int)Pref.Volume);
 if (NMus)
 Mix_VolumeMusic((int)Pref.VolumeM);
 else
 Mix_VolumeMusic((int)Pref.VolumeM / 2);
}

59 changes: 30 additions & 29 deletions
src/audio.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,43 +29,44 @@
/*** Enumération des sons ***/
/****************************/
enum eSon {
 sClic=0,
 sSpeed,
 sCrash,
 sEnd,
 sLose,
 sEtire,
 sWagon,
 sReduit,
 sLive,
 sFin
sClic = 0,
sSpeed,
sCrash,
sEnd,
sLose,
sEtire,
sWagon,
sReduit,
sLive,
sFin
};

/*** Définition de la classe Audio ***/
/*************************************/
class Audio {
 public:
 Audio(void);
 ~Audio(void);
class Audio
{
public:
 Audio(void);
 ~Audio(void);

 /*** Fonctions ***/
 bool Init(void); // Initialise et charge les fichiers audio
 void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
 void NextMusic(void); // Passe à la music suivante
/*** Fonctions ***/
bool Init(void); // Initialise et charge les fichiers audio
void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
void NextMusic(void); // Passe à la music suivante

 void Play(eSon); // Joue un son
 void PlayMusic(void); // Joue la music
void Play(eSon); // Joue un son
void PlayMusic(void); // Joue la music

 void PauseMusic(bool Etat); // Met ou no la music en pause
void PauseMusic(bool Etat); // Met ou no la music en pause

 void DoVolume(void); // Valide les volumes audio
 /*** Variables ***/
 int N; // Nombre d'échantillon audio
 int NMus; // Numéro de la music en cours
 int MemoHorloge; // Mémorise l'horloge pour les clics
 Mix_Chunk **Son; // Pointe sur les sons
 Mix_Music *Music; // Pointe sur les musics
void DoVolume(void); // Valide les volumes audio

/*** Variables ***/
int N; // Nombre d'échantillon audio
int NMus; // Numéro de la music en cours
int MemoHorloge; // Mémorise l'horloge pour les clics
Mix_Chunk **Son; // Pointe sur les sons
Mix_Music *Music; // Pointe sur les musics
};

#endif
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Work/clang format#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

petitlapin
merged 3 commits into

from

Dec 31, 2023
 Merged


Work/clang format
#18
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
03e4e53

add clang-format


petitlapin Dec 31, 2023
be3f91c

clang-format all code


petitlapin Dec 31, 2023
e50a7ad

workflow for clang-format


petitlapin Dec 31, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 16 additions & 0 deletions
.clang-format

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
---
Language: Cpp
BasedOnStyle: Webkit
PointerAlignment: Right
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: false
SortIncludes: false
AlignAfterOpenBracket: Align
BreakBeforeBraces: Custom
BraceWrapping:
 BeforeElse: true
 AfterFunction: true
 AfterClass: true
 AfterStruct: true
BreakConstructorInitializers: AfterColon
NamespaceIndentation: All

13 changes: 13 additions & 0 deletions
.github/workflows/clang-format.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
name: clang-format Check
on: [push, pull_request]
jobs:
 formatting-check:
 name: Formatting Check
 runs-on: ubuntu-latest
 steps:
 - uses: actions/checkout@v4
 - name: Run clang-format style check for C/C++/Protobuf programs.
 uses: jidicula/clang-format-action@v4.11.0
 with:
 clang-format-version: '16'
 check-path: 'src'

239 changes: 127 additions & 112 deletions
src/audio.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// (_||_/
// ( )
// ( )
// ( o 0 )
//-OOO°--(_)---°OOO---------------------------------------
// Copyright (C) 2006 By Dominique Roux-Serret
Expand DownExpand Up@@ -36,155 +36,170 @@ extern int Horloge;

/*** Constructeur et Destructeur ***/
/***********************************/
Audio::Audio(void) : N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{ }
Audio::Audio(void) :
 N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{
}

Audio::~Audio(void)
{
 if(N) {
 Mix_HaltChannel(-1);
 for(int i=0;i<N;i++) 
 if(Son[i]) Mix_FreeChunk(Son[i]);
 delete [] Son;
 }
 Mix_CloseAudio();
 if (N) {
 Mix_HaltChannel(-1);
 for (int i = 0; i < N; i++)
 if (Son[i])
 Mix_FreeChunk(Son[i]);
 delete[] Son;
 }
 Mix_CloseAudio();
}

/*** Initialise l'Audio ***/
/**************************/
bool Audio::Init(void)
{
 char PathFile[512];

if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) {
 SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
 return false;
 }
 /*** Allocation de la mémoire ***/
N=sFin;
 Son=new Mix_Chunk* [sFin];
 /*** Chargement des sons ***/
 strcpy(PathFile,"Sounds/clic.wav");
 Utils::GetPath(PathFile);
 Son[sClic]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/speed.wav");
 Utils::GetPath(PathFile);
 Son[sSpeed]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/crash.wav");
 Utils::GetPath(PathFile);
 Son[sCrash]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/end.wav");
 Utils::GetPath(PathFile);
 Son[sEnd]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/lose.wav");
 Utils::GetPath(PathFile);
 Son[sLose]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/etire.wav");
 Utils::GetPath(PathFile);
 Son[sEtire]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/wagon.wav");
 Utils::GetPath(PathFile);
 Son[sWagon]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/reduit.wav");
 Utils::GetPath(PathFile);
 Son[sReduit]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/live.wav");
 Utils::GetPath(PathFile);
 Son[sLive]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/menu.mod");
 Utils::GetPath(PathFile);
 Music=Mix_LoadMUS(PathFile);
 return true;
char PathFile[512];

 if (Mix_OpenAudio(22050,AUDIO_S16, 1, 1024)) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
return false;
}

/*** Allocation de la mémoire ***/
 N = sFin;
Son = new Mix_Chunk *[sFin];

/*** Chargement des sons ***/
strcpy(PathFile,"Sounds/clic.wav");
Utils::GetPath(PathFile);
Son[sClic] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/speed.wav");
Utils::GetPath(PathFile);
Son[sSpeed] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/crash.wav");
Utils::GetPath(PathFile);
Son[sCrash] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/end.wav");
Utils::GetPath(PathFile);
Son[sEnd] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/lose.wav");
Utils::GetPath(PathFile);
Son[sLose] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/etire.wav");
Utils::GetPath(PathFile);
Son[sEtire] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/wagon.wav");
Utils::GetPath(PathFile);
Son[sWagon] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/reduit.wav");
Utils::GetPath(PathFile);
Son[sReduit] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/live.wav");
Utils::GetPath(PathFile);
Son[sLive] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/menu.mod");
Utils::GetPath(PathFile);
Music = Mix_LoadMUS(PathFile);

return true;
}

/*** Charge une music 0=menu 1,2,3,4 = game ***/
/**********************************************/
void Audio::LoadMusic(int Num)
{
 char Provi[512]="Sounds/jeu1.xm";

 if(!N) return;

 NMus=Num;

 if(Music) {
 PauseMusic(true);
 Mix_HaltMusic(); // Arrete la music
 Mix_FreeMusic(Music);
 Music=NULL;
 }

 if(Num==0) { // Si music du menu
 strcpy(Provi,"Sounds/menu.mod");
 Utils::GetPath(Provi);
 Music=Mix_LoadMUS(Provi);
 }
 else {
 Provi[10]=(char)(Num)+'0';
 Utils::GetPath(Provi);
 Music=Mix_LoadMUS(Provi);
 }
 PlayMusic();
 char Provi[512] = "Sounds/jeu1.xm";

 if (!N)
 return;

 NMus = Num;

 if (Music) {
 PauseMusic(true);
 Mix_HaltMusic(); // Arrete la music
 Mix_FreeMusic(Music);
 Music = NULL;
 }

 if (Num == 0) { // Si music du menu
 strcpy(Provi, "Sounds/menu.mod");
 Utils::GetPath(Provi);
 Music = Mix_LoadMUS(Provi);
 }
 else {
 Provi[10] = (char)(Num) + '0';
 Utils::GetPath(Provi);
 Music = Mix_LoadMUS(Provi);
 }
 PlayMusic();
}

/*** Passe à la music de jeu suivante ***/
/****************************************/
void Audio::NextMusic(void)
{
 NMus++;
 if(NMus>2) NMus=1;
 LoadMusic(NMus);
 NMus++;
 if (NMus > 2)
 NMus = 1;
 LoadMusic(NMus);
}

/*** Fait la lecture d'un son ***/
/********************************/
void Audio::Play(eSon So) {
 if(!N) return;

 if(So==sClic) {
 if(Horloge-MemoHorloge<=120) return;
 MemoHorloge=Horloge;
 }

 Mix_PlayChannel(-1,Son[So],0);
void Audio::Play(eSon So)
{
 if (!N)
 return;

 if (So == sClic) {
 if (Horloge - MemoHorloge <= 120)
 return;
 MemoHorloge = Horloge;
 }

 Mix_PlayChannel(-1, Son[So], 0);
}

/*** Joue la music ***/
/*********************/
void Audio::PlayMusic(void) {
 if(Music && N) {
 Mix_PlayMusic(Music,-1);
 DoVolume();
 }
void Audio::PlayMusic(void)
{
 if (Music && N) {
 Mix_PlayMusic(Music, -1);
 DoVolume();
 }
}

void Audio::PauseMusic(bool Et)
{
 if(!N) return;
 if (!N)
 return;

 if(Et) Mix_PauseMusic();
 else Mix_ResumeMusic();
 if (Et)
 Mix_PauseMusic();
 else
 Mix_ResumeMusic();
}

/*** Valide les Volumes ***/
/**************************/
void Audio::DoVolume(void)
{
 if(!N) return;

 Mix_Volume(-1,(int)Pref.Volume);
 if(NMus) Mix_VolumeMusic((int)Pref.VolumeM);
 else Mix_VolumeMusic((int)Pref.VolumeM/2);
 if (!N)
 return;

 Mix_Volume(-1, (int)Pref.Volume);
 if (NMus)
 Mix_VolumeMusic((int)Pref.VolumeM);
 else
 Mix_VolumeMusic((int)Pref.VolumeM / 2);
}

59 changes: 30 additions & 29 deletions
src/audio.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,43 +29,44 @@
/*** Enumération des sons ***/
/****************************/
enum eSon {
 sClic=0,
 sSpeed,
 sCrash,
 sEnd,
 sLose,
 sEtire,
 sWagon,
 sReduit,
 sLive,
 sFin
sClic = 0,
sSpeed,
sCrash,
sEnd,
sLose,
sEtire,
sWagon,
sReduit,
sLive,
sFin
};

/*** Définition de la classe Audio ***/
/*************************************/
class Audio {
 public:
 Audio(void);
 ~Audio(void);
class Audio
{
public:
 Audio(void);
 ~Audio(void);

 /*** Fonctions ***/
 bool Init(void); // Initialise et charge les fichiers audio
 void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
 void NextMusic(void); // Passe à la music suivante
/*** Fonctions ***/
bool Init(void); // Initialise et charge les fichiers audio
void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
void NextMusic(void); // Passe à la music suivante

 void Play(eSon); // Joue un son
 void PlayMusic(void); // Joue la music
void Play(eSon); // Joue un son
void PlayMusic(void); // Joue la music

 void PauseMusic(bool Etat); // Met ou no la music en pause
void PauseMusic(bool Etat); // Met ou no la music en pause

 void DoVolume(void); // Valide les volumes audio
 /*** Variables ***/
 int N; // Nombre d'échantillon audio
 int NMus; // Numéro de la music en cours
 int MemoHorloge; // Mémorise l'horloge pour les clics
 Mix_Chunk **Son; // Pointe sur les sons
 Mix_Music *Music; // Pointe sur les musics
void DoVolume(void); // Valide les volumes audio

/*** Variables ***/
int N; // Nombre d'échantillon audio
int NMus; // Numéro de la music en cours
int MemoHorloge; // Mémorise l'horloge pour les clics
Mix_Chunk **Son; // Pointe sur les sons
Mix_Music *Music; // Pointe sur les musics
};

#endif
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Work/clang format#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

petitlapin
merged 3 commits into

from

Dec 31, 2023
 Merged


Work/clang format
#18
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
03e4e53

add clang-format


petitlapin Dec 31, 2023
be3f91c

clang-format all code


petitlapin Dec 31, 2023
e50a7ad

workflow for clang-format


petitlapin Dec 31, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 16 additions & 0 deletions
.clang-format

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
---
Language: Cpp
BasedOnStyle: Webkit
PointerAlignment: Right
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: false
SortIncludes: false
AlignAfterOpenBracket: Align
BreakBeforeBraces: Custom
BraceWrapping:
 BeforeElse: true
 AfterFunction: true
 AfterClass: true
 AfterStruct: true
BreakConstructorInitializers: AfterColon
NamespaceIndentation: All

13 changes: 13 additions & 0 deletions
.github/workflows/clang-format.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
name: clang-format Check
on: [push, pull_request]
jobs:
 formatting-check:
 name: Formatting Check
 runs-on: ubuntu-latest
 steps:
 - uses: actions/checkout@v4
 - name: Run clang-format style check for C/C++/Protobuf programs.
 uses: jidicula/clang-format-action@v4.11.0
 with:
 clang-format-version: '16'
 check-path: 'src'

239 changes: 127 additions & 112 deletions
src/audio.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// (_||_/
// ( )
// ( )
// ( o 0 )
//-OOO°--(_)---°OOO---------------------------------------
// Copyright (C) 2006 By Dominique Roux-Serret
Expand DownExpand Up@@ -36,155 +36,170 @@ extern int Horloge;

/*** Constructeur et Destructeur ***/
/***********************************/
Audio::Audio(void) : N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{ }
Audio::Audio(void) :
 N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{
}

Audio::~Audio(void)
{
 if(N) {
 Mix_HaltChannel(-1);
 for(int i=0;i<N;i++) 
 if(Son[i]) Mix_FreeChunk(Son[i]);
 delete [] Son;
 }
 Mix_CloseAudio();
 if (N) {
 Mix_HaltChannel(-1);
 for (int i = 0; i < N; i++)
 if (Son[i])
 Mix_FreeChunk(Son[i]);
 delete[] Son;
 }
 Mix_CloseAudio();
}

/*** Initialise l'Audio ***/
/**************************/
bool Audio::Init(void)
{
 char PathFile[512];

if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) {
 SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
 return false;
 }
 /*** Allocation de la mémoire ***/
N=sFin;
 Son=new Mix_Chunk* [sFin];
 /*** Chargement des sons ***/
 strcpy(PathFile,"Sounds/clic.wav");
 Utils::GetPath(PathFile);
 Son[sClic]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/speed.wav");
 Utils::GetPath(PathFile);
 Son[sSpeed]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/crash.wav");
 Utils::GetPath(PathFile);
 Son[sCrash]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/end.wav");
 Utils::GetPath(PathFile);
 Son[sEnd]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/lose.wav");
 Utils::GetPath(PathFile);
 Son[sLose]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/etire.wav");
 Utils::GetPath(PathFile);
 Son[sEtire]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/wagon.wav");
 Utils::GetPath(PathFile);
 Son[sWagon]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/reduit.wav");
 Utils::GetPath(PathFile);
 Son[sReduit]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/live.wav");
 Utils::GetPath(PathFile);
 Son[sLive]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/menu.mod");
 Utils::GetPath(PathFile);
 Music=Mix_LoadMUS(PathFile);
 return true;
char PathFile[512];

 if (Mix_OpenAudio(22050,AUDIO_S16, 1, 1024)) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
return false;
}

/*** Allocation de la mémoire ***/
 N = sFin;
Son = new Mix_Chunk *[sFin];

/*** Chargement des sons ***/
strcpy(PathFile,"Sounds/clic.wav");
Utils::GetPath(PathFile);
Son[sClic] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/speed.wav");
Utils::GetPath(PathFile);
Son[sSpeed] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/crash.wav");
Utils::GetPath(PathFile);
Son[sCrash] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/end.wav");
Utils::GetPath(PathFile);
Son[sEnd] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/lose.wav");
Utils::GetPath(PathFile);
Son[sLose] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/etire.wav");
Utils::GetPath(PathFile);
Son[sEtire] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/wagon.wav");
Utils::GetPath(PathFile);
Son[sWagon] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/reduit.wav");
Utils::GetPath(PathFile);
Son[sReduit] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/live.wav");
Utils::GetPath(PathFile);
Son[sLive] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/menu.mod");
Utils::GetPath(PathFile);
Music = Mix_LoadMUS(PathFile);

return true;
}

/*** Charge une music 0=menu 1,2,3,4 = game ***/
/**********************************************/
void Audio::LoadMusic(int Num)
{
 char Provi[512]="Sounds/jeu1.xm";

 if(!N) return;

 NMus=Num;

 if(Music) {
 PauseMusic(true);
 Mix_HaltMusic(); // Arrete la music
 Mix_FreeMusic(Music);
 Music=NULL;
 }

 if(Num==0) { // Si music du menu
 strcpy(Provi,"Sounds/menu.mod");
 Utils::GetPath(Provi);
 Music=Mix_LoadMUS(Provi);
 }
 else {
 Provi[10]=(char)(Num)+'0';
 Utils::GetPath(Provi);
 Music=Mix_LoadMUS(Provi);
 }
 PlayMusic();
 char Provi[512] = "Sounds/jeu1.xm";

 if (!N)
 return;

 NMus = Num;

 if (Music) {
 PauseMusic(true);
 Mix_HaltMusic(); // Arrete la music
 Mix_FreeMusic(Music);
 Music = NULL;
 }

 if (Num == 0) { // Si music du menu
 strcpy(Provi, "Sounds/menu.mod");
 Utils::GetPath(Provi);
 Music = Mix_LoadMUS(Provi);
 }
 else {
 Provi[10] = (char)(Num) + '0';
 Utils::GetPath(Provi);
 Music = Mix_LoadMUS(Provi);
 }
 PlayMusic();
}

/*** Passe à la music de jeu suivante ***/
/****************************************/
void Audio::NextMusic(void)
{
 NMus++;
 if(NMus>2) NMus=1;
 LoadMusic(NMus);
 NMus++;
 if (NMus > 2)
 NMus = 1;
 LoadMusic(NMus);
}

/*** Fait la lecture d'un son ***/
/********************************/
void Audio::Play(eSon So) {
 if(!N) return;

 if(So==sClic) {
 if(Horloge-MemoHorloge<=120) return;
 MemoHorloge=Horloge;
 }

 Mix_PlayChannel(-1,Son[So],0);
void Audio::Play(eSon So)
{
 if (!N)
 return;

 if (So == sClic) {
 if (Horloge - MemoHorloge <= 120)
 return;
 MemoHorloge = Horloge;
 }

 Mix_PlayChannel(-1, Son[So], 0);
}

/*** Joue la music ***/
/*********************/
void Audio::PlayMusic(void) {
 if(Music && N) {
 Mix_PlayMusic(Music,-1);
 DoVolume();
 }
void Audio::PlayMusic(void)
{
 if (Music && N) {
 Mix_PlayMusic(Music, -1);
 DoVolume();
 }
}

void Audio::PauseMusic(bool Et)
{
 if(!N) return;
 if (!N)
 return;

 if(Et) Mix_PauseMusic();
 else Mix_ResumeMusic();
 if (Et)
 Mix_PauseMusic();
 else
 Mix_ResumeMusic();
}

/*** Valide les Volumes ***/
/**************************/
void Audio::DoVolume(void)
{
 if(!N) return;

 Mix_Volume(-1,(int)Pref.Volume);
 if(NMus) Mix_VolumeMusic((int)Pref.VolumeM);
 else Mix_VolumeMusic((int)Pref.VolumeM/2);
 if (!N)
 return;

 Mix_Volume(-1, (int)Pref.Volume);
 if (NMus)
 Mix_VolumeMusic((int)Pref.VolumeM);
 else
 Mix_VolumeMusic((int)Pref.VolumeM / 2);
}

59 changes: 30 additions & 29 deletions
src/audio.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,43 +29,44 @@
/*** Enumération des sons ***/
/****************************/
enum eSon {
 sClic=0,
 sSpeed,
 sCrash,
 sEnd,
 sLose,
 sEtire,
 sWagon,
 sReduit,
 sLive,
 sFin
sClic = 0,
sSpeed,
sCrash,
sEnd,
sLose,
sEtire,
sWagon,
sReduit,
sLive,
sFin
};

/*** Définition de la classe Audio ***/
/*************************************/
class Audio {
 public:
 Audio(void);
 ~Audio(void);
class Audio
{
public:
 Audio(void);
 ~Audio(void);

 /*** Fonctions ***/
 bool Init(void); // Initialise et charge les fichiers audio
 void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
 void NextMusic(void); // Passe à la music suivante
/*** Fonctions ***/
bool Init(void); // Initialise et charge les fichiers audio
void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
void NextMusic(void); // Passe à la music suivante

 void Play(eSon); // Joue un son
 void PlayMusic(void); // Joue la music
void Play(eSon); // Joue un son
void PlayMusic(void); // Joue la music

 void PauseMusic(bool Etat); // Met ou no la music en pause
void PauseMusic(bool Etat); // Met ou no la music en pause

 void DoVolume(void); // Valide les volumes audio
 /*** Variables ***/
 int N; // Nombre d'échantillon audio
 int NMus; // Numéro de la music en cours
 int MemoHorloge; // Mémorise l'horloge pour les clics
 Mix_Chunk **Son; // Pointe sur les sons
 Mix_Music *Music; // Pointe sur les musics
void DoVolume(void); // Valide les volumes audio

/*** Variables ***/
int N; // Nombre d'échantillon audio
int NMus; // Numéro de la music en cours
int MemoHorloge; // Mémorise l'horloge pour les clics
Mix_Chunk **Son; // Pointe sur les sons
Mix_Music *Music; // Pointe sur les musics
};

#endif
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Work/clang format#18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

petitlapin
merged 3 commits into

from

Dec 31, 2023
 Merged


Work/clang format
#18
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
03e4e53

add clang-format


petitlapin Dec 31, 2023
be3f91c

clang-format all code


petitlapin Dec 31, 2023
e50a7ad

workflow for clang-format


petitlapin Dec 31, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 16 additions & 0 deletions
.clang-format

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
---
Language: Cpp
BasedOnStyle: Webkit
PointerAlignment: Right
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: false
SortIncludes: false
AlignAfterOpenBracket: Align
BreakBeforeBraces: Custom
BraceWrapping:
 BeforeElse: true
 AfterFunction: true
 AfterClass: true
 AfterStruct: true
BreakConstructorInitializers: AfterColon
NamespaceIndentation: All

13 changes: 13 additions & 0 deletions
.github/workflows/clang-format.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
name: clang-format Check
on: [push, pull_request]
jobs:
 formatting-check:
 name: Formatting Check
 runs-on: ubuntu-latest
 steps:
 - uses: actions/checkout@v4
 - name: Run clang-format style check for C/C++/Protobuf programs.
 uses: jidicula/clang-format-action@v4.11.0
 with:
 clang-format-version: '16'
 check-path: 'src'

239 changes: 127 additions & 112 deletions
src/audio.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
// (_||_/
// ( )
// ( )
// ( o 0 )
//-OOO°--(_)---°OOO---------------------------------------
// Copyright (C) 2006 By Dominique Roux-Serret
Expand DownExpand Up@@ -36,155 +36,170 @@ extern int Horloge;

/*** Constructeur et Destructeur ***/
/***********************************/
Audio::Audio(void) : N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{ }
Audio::Audio(void) :
 N(0), NMus(0), MemoHorloge(0), Son(NULL), Music(NULL)
{
}

Audio::~Audio(void)
{
 if(N) {
 Mix_HaltChannel(-1);
 for(int i=0;i<N;i++) 
 if(Son[i]) Mix_FreeChunk(Son[i]);
 delete [] Son;
 }
 Mix_CloseAudio();
 if (N) {
 Mix_HaltChannel(-1);
 for (int i = 0; i < N; i++)
 if (Son[i])
 Mix_FreeChunk(Son[i]);
 delete[] Son;
 }
 Mix_CloseAudio();
}

/*** Initialise l'Audio ***/
/**************************/
bool Audio::Init(void)
{
 char PathFile[512];

if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) {
 SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
 return false;
 }
 /*** Allocation de la mémoire ***/
N=sFin;
 Son=new Mix_Chunk* [sFin];
 /*** Chargement des sons ***/
 strcpy(PathFile,"Sounds/clic.wav");
 Utils::GetPath(PathFile);
 Son[sClic]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/speed.wav");
 Utils::GetPath(PathFile);
 Son[sSpeed]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/crash.wav");
 Utils::GetPath(PathFile);
 Son[sCrash]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/end.wav");
 Utils::GetPath(PathFile);
 Son[sEnd]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/lose.wav");
 Utils::GetPath(PathFile);
 Son[sLose]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/etire.wav");
 Utils::GetPath(PathFile);
 Son[sEtire]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/wagon.wav");
 Utils::GetPath(PathFile);
 Son[sWagon]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/reduit.wav");
 Utils::GetPath(PathFile);
 Son[sReduit]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/live.wav");
 Utils::GetPath(PathFile);
 Son[sLive]=Mix_LoadWAV(PathFile);

 strcpy(PathFile,"Sounds/menu.mod");
 Utils::GetPath(PathFile);
 Music=Mix_LoadMUS(PathFile);
 return true;
char PathFile[512];

 if (Mix_OpenAudio(22050,AUDIO_S16, 1, 1024)) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Enable to init Sound card: %s", SDL_GetError());
return false;
}

/*** Allocation de la mémoire ***/
 N = sFin;
Son = new Mix_Chunk *[sFin];

/*** Chargement des sons ***/
strcpy(PathFile,"Sounds/clic.wav");
Utils::GetPath(PathFile);
Son[sClic] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/speed.wav");
Utils::GetPath(PathFile);
Son[sSpeed] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/crash.wav");
Utils::GetPath(PathFile);
Son[sCrash] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/end.wav");
Utils::GetPath(PathFile);
Son[sEnd] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/lose.wav");
Utils::GetPath(PathFile);
Son[sLose] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/etire.wav");
Utils::GetPath(PathFile);
Son[sEtire] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/wagon.wav");
Utils::GetPath(PathFile);
Son[sWagon] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/reduit.wav");
Utils::GetPath(PathFile);
Son[sReduit] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/live.wav");
Utils::GetPath(PathFile);
Son[sLive] = Mix_LoadWAV(PathFile);

strcpy(PathFile,"Sounds/menu.mod");
Utils::GetPath(PathFile);
Music = Mix_LoadMUS(PathFile);

return true;
}

/*** Charge une music 0=menu 1,2,3,4 = game ***/
/**********************************************/
void Audio::LoadMusic(int Num)
{
 char Provi[512]="Sounds/jeu1.xm";

 if(!N) return;

 NMus=Num;

 if(Music) {
 PauseMusic(true);
 Mix_HaltMusic(); // Arrete la music
 Mix_FreeMusic(Music);
 Music=NULL;
 }

 if(Num==0) { // Si music du menu
 strcpy(Provi,"Sounds/menu.mod");
 Utils::GetPath(Provi);
 Music=Mix_LoadMUS(Provi);
 }
 else {
 Provi[10]=(char)(Num)+'0';
 Utils::GetPath(Provi);
 Music=Mix_LoadMUS(Provi);
 }
 PlayMusic();
 char Provi[512] = "Sounds/jeu1.xm";

 if (!N)
 return;

 NMus = Num;

 if (Music) {
 PauseMusic(true);
 Mix_HaltMusic(); // Arrete la music
 Mix_FreeMusic(Music);
 Music = NULL;
 }

 if (Num == 0) { // Si music du menu
 strcpy(Provi, "Sounds/menu.mod");
 Utils::GetPath(Provi);
 Music = Mix_LoadMUS(Provi);
 }
 else {
 Provi[10] = (char)(Num) + '0';
 Utils::GetPath(Provi);
 Music = Mix_LoadMUS(Provi);
 }
 PlayMusic();
}

/*** Passe à la music de jeu suivante ***/
/****************************************/
void Audio::NextMusic(void)
{
 NMus++;
 if(NMus>2) NMus=1;
 LoadMusic(NMus);
 NMus++;
 if (NMus > 2)
 NMus = 1;
 LoadMusic(NMus);
}

/*** Fait la lecture d'un son ***/
/********************************/
void Audio::Play(eSon So) {
 if(!N) return;

 if(So==sClic) {
 if(Horloge-MemoHorloge<=120) return;
 MemoHorloge=Horloge;
 }

 Mix_PlayChannel(-1,Son[So],0);
void Audio::Play(eSon So)
{
 if (!N)
 return;

 if (So == sClic) {
 if (Horloge - MemoHorloge <= 120)
 return;
 MemoHorloge = Horloge;
 }

 Mix_PlayChannel(-1, Son[So], 0);
}

/*** Joue la music ***/
/*********************/
void Audio::PlayMusic(void) {
 if(Music && N) {
 Mix_PlayMusic(Music,-1);
 DoVolume();
 }
void Audio::PlayMusic(void)
{
 if (Music && N) {
 Mix_PlayMusic(Music, -1);
 DoVolume();
 }
}

void Audio::PauseMusic(bool Et)
{
 if(!N) return;
 if (!N)
 return;

 if(Et) Mix_PauseMusic();
 else Mix_ResumeMusic();
 if (Et)
 Mix_PauseMusic();
 else
 Mix_ResumeMusic();
}

/*** Valide les Volumes ***/
/**************************/
void Audio::DoVolume(void)
{
 if(!N) return;

 Mix_Volume(-1,(int)Pref.Volume);
 if(NMus) Mix_VolumeMusic((int)Pref.VolumeM);
 else Mix_VolumeMusic((int)Pref.VolumeM/2);
 if (!N)
 return;

 Mix_Volume(-1, (int)Pref.Volume);
 if (NMus)
 Mix_VolumeMusic((int)Pref.VolumeM);
 else
 Mix_VolumeMusic((int)Pref.VolumeM / 2);
}

59 changes: 30 additions & 29 deletions
src/audio.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,43 +29,44 @@
/*** Enumération des sons ***/
/****************************/
enum eSon {
 sClic=0,
 sSpeed,
 sCrash,
 sEnd,
 sLose,
 sEtire,
 sWagon,
 sReduit,
 sLive,
 sFin
sClic = 0,
sSpeed,
sCrash,
sEnd,
sLose,
sEtire,
sWagon,
sReduit,
sLive,
sFin
};

/*** Définition de la classe Audio ***/
/*************************************/
class Audio {
 public:
 Audio(void);
 ~Audio(void);
class Audio
{
public:
 Audio(void);
 ~Audio(void);

 /*** Fonctions ***/
 bool Init(void); // Initialise et charge les fichiers audio
 void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
 void NextMusic(void); // Passe à la music suivante
/*** Fonctions ***/
bool Init(void); // Initialise et charge les fichiers audio
void LoadMusic(int Num); // Charge une music, 0 = music du menu 1,2,3,4=Jeu
void NextMusic(void); // Passe à la music suivante

 void Play(eSon); // Joue un son
 void PlayMusic(void); // Joue la music
void Play(eSon); // Joue un son
void PlayMusic(void); // Joue la music

 void PauseMusic(bool Etat); // Met ou no la music en pause
void PauseMusic(bool Etat); // Met ou no la music en pause

 void DoVolume(void); // Valide les volumes audio
 /*** Variables ***/
 int N; // Nombre d'échantillon audio
 int NMus; // Numéro de la music en cours
 int MemoHorloge; // Mémorise l'horloge pour les clics
 Mix_Chunk **Son; // Pointe sur les sons
 Mix_Music *Music; // Pointe sur les musics
void DoVolume(void); // Valide les volumes audio

/*** Variables ***/
int N; // Nombre d'échantillon audio
int NMus; // Numéro de la music en cours
int MemoHorloge; // Mémorise l'horloge pour les clics
Mix_Chunk **Son; // Pointe sur les sons
Mix_Music *Music; // Pointe sur les musics
};

#endif
Loading