* [PATCH - hdspmixer 0/4] Beautification patches
@ 2011-02-03 21:43 Adrian Knoth
2011-02-03 21:43 ` [PATCH - hdspmixer 1/4] hdspmixer: retab and reindent code Adrian Knoth
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Adrian Knoth @ 2011-02-03 21:43 UTC (permalink / raw
To: patch; +Cc: Adrian Knoth, alsa-devel
Hi!
Here's a line of code beautification patches for hdspmixer. I broke them up
into smaller pieces to ease the review, though one may find four patches
for no added functionality a little bit excessive. If so, please feel
free simply commit them as a single commit.
Cheers
Adrian Knoth (4):
hdspmixer: retab and reindent code.
hdspmixer: Improve readability.
hdspmixer: Beautification; Lower nesting depth
hdspmixer: Break overlong line and don't plenken.
--
1.7.2.3
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH - hdspmixer 1/4] hdspmixer: retab and reindent code.
2011-02-03 21:43 [PATCH - hdspmixer 0/4] Beautification patches Adrian Knoth
@ 2011-02-03 21:43 ` Adrian Knoth
2011-02-03 21:43 ` [PATCH - hdspmixer 2/4] hdspmixer: Improve readability Adrian Knoth
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Adrian Knoth @ 2011-02-03 21:43 UTC (permalink / raw
To: patch; +Cc: Adrian Knoth, alsa-devel
Something seriously was wrong, probably different patches with different
tabwidth levels. I switched to spaces to avoid ambiguity and let vim
reindent everything.
Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
diff --git a/hdspmixer/src/hdspmixer.cxx b/hdspmixer/src/hdspmixer.cxx
index 2a7c5c9..49a9985 100644
--- a/hdspmixer/src/hdspmixer.cxx
+++ b/hdspmixer/src/hdspmixer.cxx
@@ -39,18 +39,18 @@ int main(int argc, char **argv)
char *name;
int card;
int cards = 0;
-
+
card = -1;
printf("\nHDSPMixer %s - Copyright (C) 2003 Thomas Charbonnel <thomas@undata.org>\n", VERSION);
printf("This program comes with ABSOLUTELY NO WARRANTY\n");
printf("HDSPMixer is free software, see the file COPYING for details\n\n");
printf("Looking for RME cards :\n");
while (snd_card_next(&card) >= 0) {
- if (card < 0) {
- break;
- } else {
- snd_card_get_longname(card, &name);
- printf("Card %d : %s\n", card, name);
+ if (card < 0) {
+ break;
+ } else {
+ snd_card_get_longname(card, &name);
+ printf("Card %d : %s\n", card, name);
if (!strncmp(name, "RME Hammerfall DSP + Multiface", 30)) {
printf("Multiface found !\n");
hdsp_cards[cards] = new HDSPMixerCard(Multiface, card);
@@ -67,34 +67,34 @@ int main(int argc, char **argv)
printf("HDSP 9632 found !\n");
hdsp_cards[cards] = new HDSPMixerCard(H9632, card);
cards++;
- } else if (!strncmp(name, "RME MADIface", 12)) {
- printf("RME MADIface found !\n");
- hdsp_cards[cards] = new HDSPMixerCard(HDSPeMADI, card);
- cards++;
- } else if (!strncmp(name, "RME MADI", 8)) {
- printf("RME MADI found !\n");
- hdsp_cards[cards] = new HDSPMixerCard(HDSPeMADI, card);
- cards++;
- } else if (!strncmp(name, "RME RayDAT", 10)) {
- printf("RME RayDAT found !\n");
- hdsp_cards[cards] = new HDSPMixerCard(HDSPeRayDAT, card);
- cards++;
- } else if (!strncmp(name, "RME AIO", 7)) {
- printf("RME AIO found !\n");
- hdsp_cards[cards] = new HDSPMixerCard(HDSPeAIO, card);
- cards++;
- } else if (!strncmp(name, "RME Hammerfall DSP", 18)) {
- printf("Uninitialized HDSP card found.\nUse hdsploader to upload configuration data to the card.\n");
- }
- }
+ } else if (!strncmp(name, "RME MADIface", 12)) {
+ printf("RME MADIface found !\n");
+ hdsp_cards[cards] = new HDSPMixerCard(HDSPeMADI, card);
+ cards++;
+ } else if (!strncmp(name, "RME MADI", 8)) {
+ printf("RME MADI found !\n");
+ hdsp_cards[cards] = new HDSPMixerCard(HDSPeMADI, card);
+ cards++;
+ } else if (!strncmp(name, "RME RayDAT", 10)) {
+ printf("RME RayDAT found !\n");
+ hdsp_cards[cards] = new HDSPMixerCard(HDSPeRayDAT, card);
+ cards++;
+ } else if (!strncmp(name, "RME AIO", 7)) {
+ printf("RME AIO found !\n");
+ hdsp_cards[cards] = new HDSPMixerCard(HDSPeAIO, card);
+ cards++;
+ } else if (!strncmp(name, "RME Hammerfall DSP", 18)) {
+ printf("Uninitialized HDSP card found.\nUse hdsploader to upload configuration data to the card.\n");
+ }
+ }
}
free(name);
if (!cards) {
- printf("No RME cards found.\n");
- exit(EXIT_FAILURE);
+ printf("No RME cards found.\n");
+ exit(EXIT_FAILURE);
}
for (int i = cards; i < 3; ++i) {
- hdsp_cards[i] = NULL;
+ hdsp_cards[i] = NULL;
}
printf("%d RME cards %s found.\n", cards, (cards > 1) ? "cards" : "card");
window = new HDSPMixerWindow(0, 0, hdsp_cards[0]->window_width, hdsp_cards[0]->window_height, "HDSPMixer", hdsp_cards[0], hdsp_cards[1], hdsp_cards[2]);
--
1.7.2.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH - hdspmixer 2/4] hdspmixer: Improve readability.
2011-02-03 21:43 [PATCH - hdspmixer 0/4] Beautification patches Adrian Knoth
2011-02-03 21:43 ` [PATCH - hdspmixer 1/4] hdspmixer: retab and reindent code Adrian Knoth
@ 2011-02-03 21:43 ` Adrian Knoth
2011-02-03 21:43 ` [PATCH - hdspmixer 3/4] hdspmixer: Beautification; Lower nesting depth Adrian Knoth
2011-02-03 21:43 ` [PATCH - hdspmixer 4/4] hdspmixer: Break overlong line and don't plenken Adrian Knoth
3 siblings, 0 replies; 5+ messages in thread
From: Adrian Knoth @ 2011-02-03 21:43 UTC (permalink / raw
To: patch; +Cc: Adrian Knoth, alsa-devel
Group the statements into logical blocks.
Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
diff --git a/hdspmixer/src/hdspmixer.cxx b/hdspmixer/src/hdspmixer.cxx
index 49a9985..7e83c23 100644
--- a/hdspmixer/src/hdspmixer.cxx
+++ b/hdspmixer/src/hdspmixer.cxx
@@ -45,6 +45,7 @@ int main(int argc, char **argv)
printf("This program comes with ABSOLUTELY NO WARRANTY\n");
printf("HDSPMixer is free software, see the file COPYING for details\n\n");
printf("Looking for RME cards :\n");
+
while (snd_card_next(&card) >= 0) {
if (card < 0) {
break;
@@ -88,17 +89,21 @@ int main(int argc, char **argv)
}
}
}
+
free(name);
if (!cards) {
printf("No RME cards found.\n");
exit(EXIT_FAILURE);
}
+
for (int i = cards; i < 3; ++i) {
hdsp_cards[i] = NULL;
}
+
printf("%d RME cards %s found.\n", cards, (cards > 1) ? "cards" : "card");
window = new HDSPMixerWindow(0, 0, hdsp_cards[0]->window_width, hdsp_cards[0]->window_height, "HDSPMixer", hdsp_cards[0], hdsp_cards[1], hdsp_cards[2]);
Fl::visual(FL_DOUBLE|FL_INDEX);
window->show(argc, argv);
+
return Fl::run();
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH - hdspmixer 3/4] hdspmixer: Beautification; Lower nesting depth
2011-02-03 21:43 [PATCH - hdspmixer 0/4] Beautification patches Adrian Knoth
2011-02-03 21:43 ` [PATCH - hdspmixer 1/4] hdspmixer: retab and reindent code Adrian Knoth
2011-02-03 21:43 ` [PATCH - hdspmixer 2/4] hdspmixer: Improve readability Adrian Knoth
@ 2011-02-03 21:43 ` Adrian Knoth
2011-02-03 21:43 ` [PATCH - hdspmixer 4/4] hdspmixer: Break overlong line and don't plenken Adrian Knoth
3 siblings, 0 replies; 5+ messages in thread
From: Adrian Knoth @ 2011-02-03 21:43 UTC (permalink / raw
To: patch; +Cc: Adrian Knoth, alsa-devel
Exit the loop if card < 0. No need to nest the actual code in the else
branch.
Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
diff --git a/hdspmixer/src/hdspmixer.cxx b/hdspmixer/src/hdspmixer.cxx
index 7e83c23..6d85062 100644
--- a/hdspmixer/src/hdspmixer.cxx
+++ b/hdspmixer/src/hdspmixer.cxx
@@ -49,45 +49,45 @@ int main(int argc, char **argv)
while (snd_card_next(&card) >= 0) {
if (card < 0) {
break;
- } else {
- snd_card_get_longname(card, &name);
- printf("Card %d : %s\n", card, name);
- if (!strncmp(name, "RME Hammerfall DSP + Multiface", 30)) {
- printf("Multiface found !\n");
- hdsp_cards[cards] = new HDSPMixerCard(Multiface, card);
- cards++;
- } else if (!strncmp(name, "RME Hammerfall DSP + Digiface", 29)) {
- printf("Digiface found !\n");
- hdsp_cards[cards] = new HDSPMixerCard(Digiface, card);
- cards++;
- } else if (!strncmp(name, "RME Hammerfall HDSP 9652", 24)) {
- printf("HDSP 9652 found !\n");
- hdsp_cards[cards] = new HDSPMixerCard(H9652, card);
- cards++;
- } else if (!strncmp(name, "RME Hammerfall HDSP 9632", 24)) {
- printf("HDSP 9632 found !\n");
- hdsp_cards[cards] = new HDSPMixerCard(H9632, card);
- cards++;
- } else if (!strncmp(name, "RME MADIface", 12)) {
- printf("RME MADIface found !\n");
- hdsp_cards[cards] = new HDSPMixerCard(HDSPeMADI, card);
- cards++;
- } else if (!strncmp(name, "RME MADI", 8)) {
- printf("RME MADI found !\n");
- hdsp_cards[cards] = new HDSPMixerCard(HDSPeMADI, card);
- cards++;
- } else if (!strncmp(name, "RME RayDAT", 10)) {
- printf("RME RayDAT found !\n");
- hdsp_cards[cards] = new HDSPMixerCard(HDSPeRayDAT, card);
- cards++;
- } else if (!strncmp(name, "RME AIO", 7)) {
- printf("RME AIO found !\n");
- hdsp_cards[cards] = new HDSPMixerCard(HDSPeAIO, card);
- cards++;
- } else if (!strncmp(name, "RME Hammerfall DSP", 18)) {
- printf("Uninitialized HDSP card found.\nUse hdsploader to upload configuration data to the card.\n");
- }
}
+
+ snd_card_get_longname(card, &name);
+ printf("Card %d : %s\n", card, name);
+ if (!strncmp(name, "RME Hammerfall DSP + Multiface", 30)) {
+ printf("Multiface found !\n");
+ hdsp_cards[cards] = new HDSPMixerCard(Multiface, card);
+ cards++;
+ } else if (!strncmp(name, "RME Hammerfall DSP + Digiface", 29)) {
+ printf("Digiface found !\n");
+ hdsp_cards[cards] = new HDSPMixerCard(Digiface, card);
+ cards++;
+ } else if (!strncmp(name, "RME Hammerfall HDSP 9652", 24)) {
+ printf("HDSP 9652 found !\n");
+ hdsp_cards[cards] = new HDSPMixerCard(H9652, card);
+ cards++;
+ } else if (!strncmp(name, "RME Hammerfall HDSP 9632", 24)) {
+ printf("HDSP 9632 found !\n");
+ hdsp_cards[cards] = new HDSPMixerCard(H9632, card);
+ cards++;
+ } else if (!strncmp(name, "RME MADIface", 12)) {
+ printf("RME MADIface found !\n");
+ hdsp_cards[cards] = new HDSPMixerCard(HDSPeMADI, card);
+ cards++;
+ } else if (!strncmp(name, "RME MADI", 8)) {
+ printf("RME MADI found !\n");
+ hdsp_cards[cards] = new HDSPMixerCard(HDSPeMADI, card);
+ cards++;
+ } else if (!strncmp(name, "RME RayDAT", 10)) {
+ printf("RME RayDAT found !\n");
+ hdsp_cards[cards] = new HDSPMixerCard(HDSPeRayDAT, card);
+ cards++;
+ } else if (!strncmp(name, "RME AIO", 7)) {
+ printf("RME AIO found !\n");
+ hdsp_cards[cards] = new HDSPMixerCard(HDSPeAIO, card);
+ cards++;
+ } else if (!strncmp(name, "RME Hammerfall DSP", 18)) {
+ printf("Uninitialized HDSP card found.\nUse hdsploader to upload configuration data to the card.\n");
+ }
}
free(name);
--
1.7.2.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH - hdspmixer 4/4] hdspmixer: Break overlong line and don't plenken.
2011-02-03 21:43 [PATCH - hdspmixer 0/4] Beautification patches Adrian Knoth
` (2 preceding siblings ...)
2011-02-03 21:43 ` [PATCH - hdspmixer 3/4] hdspmixer: Beautification; Lower nesting depth Adrian Knoth
@ 2011-02-03 21:43 ` Adrian Knoth
3 siblings, 0 replies; 5+ messages in thread
From: Adrian Knoth @ 2011-02-03 21:43 UTC (permalink / raw
To: patch; +Cc: Adrian Knoth, alsa-devel
Pure code beautification, just in case somebody ever needs to touch this
again.
Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
diff --git a/hdspmixer/src/hdspmixer.cxx b/hdspmixer/src/hdspmixer.cxx
index 6d85062..866afda 100644
--- a/hdspmixer/src/hdspmixer.cxx
+++ b/hdspmixer/src/hdspmixer.cxx
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
printf("\nHDSPMixer %s - Copyright (C) 2003 Thomas Charbonnel <thomas@undata.org>\n", VERSION);
printf("This program comes with ABSOLUTELY NO WARRANTY\n");
printf("HDSPMixer is free software, see the file COPYING for details\n\n");
- printf("Looking for RME cards :\n");
+ printf("Looking for RME cards:\n");
while (snd_card_next(&card) >= 0) {
if (card < 0) {
@@ -52,37 +52,37 @@ int main(int argc, char **argv)
}
snd_card_get_longname(card, &name);
- printf("Card %d : %s\n", card, name);
+ printf("Card %d: %s\n", card, name);
if (!strncmp(name, "RME Hammerfall DSP + Multiface", 30)) {
- printf("Multiface found !\n");
+ printf("Multiface found!\n");
hdsp_cards[cards] = new HDSPMixerCard(Multiface, card);
cards++;
} else if (!strncmp(name, "RME Hammerfall DSP + Digiface", 29)) {
- printf("Digiface found !\n");
+ printf("Digiface found!\n");
hdsp_cards[cards] = new HDSPMixerCard(Digiface, card);
cards++;
} else if (!strncmp(name, "RME Hammerfall HDSP 9652", 24)) {
- printf("HDSP 9652 found !\n");
+ printf("HDSP 9652 found!\n");
hdsp_cards[cards] = new HDSPMixerCard(H9652, card);
cards++;
} else if (!strncmp(name, "RME Hammerfall HDSP 9632", 24)) {
- printf("HDSP 9632 found !\n");
+ printf("HDSP 9632 found!\n");
hdsp_cards[cards] = new HDSPMixerCard(H9632, card);
cards++;
} else if (!strncmp(name, "RME MADIface", 12)) {
- printf("RME MADIface found !\n");
+ printf("RME MADIface found!\n");
hdsp_cards[cards] = new HDSPMixerCard(HDSPeMADI, card);
cards++;
} else if (!strncmp(name, "RME MADI", 8)) {
- printf("RME MADI found !\n");
+ printf("RME MADI found!\n");
hdsp_cards[cards] = new HDSPMixerCard(HDSPeMADI, card);
cards++;
} else if (!strncmp(name, "RME RayDAT", 10)) {
- printf("RME RayDAT found !\n");
+ printf("RME RayDAT found!\n");
hdsp_cards[cards] = new HDSPMixerCard(HDSPeRayDAT, card);
cards++;
} else if (!strncmp(name, "RME AIO", 7)) {
- printf("RME AIO found !\n");
+ printf("RME AIO found!\n");
hdsp_cards[cards] = new HDSPMixerCard(HDSPeAIO, card);
cards++;
} else if (!strncmp(name, "RME Hammerfall DSP", 18)) {
@@ -101,7 +101,9 @@ int main(int argc, char **argv)
}
printf("%d RME cards %s found.\n", cards, (cards > 1) ? "cards" : "card");
- window = new HDSPMixerWindow(0, 0, hdsp_cards[0]->window_width, hdsp_cards[0]->window_height, "HDSPMixer", hdsp_cards[0], hdsp_cards[1], hdsp_cards[2]);
+ window = new HDSPMixerWindow(0, 0, hdsp_cards[0]->window_width,
+ hdsp_cards[0]->window_height, "HDSPMixer", hdsp_cards[0],
+ hdsp_cards[1], hdsp_cards[2]);
Fl::visual(FL_DOUBLE|FL_INDEX);
window->show(argc, argv);
--
1.7.2.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-02-03 21:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-03 21:43 [PATCH - hdspmixer 0/4] Beautification patches Adrian Knoth
2011-02-03 21:43 ` [PATCH - hdspmixer 1/4] hdspmixer: retab and reindent code Adrian Knoth
2011-02-03 21:43 ` [PATCH - hdspmixer 2/4] hdspmixer: Improve readability Adrian Knoth
2011-02-03 21:43 ` [PATCH - hdspmixer 3/4] hdspmixer: Beautification; Lower nesting depth Adrian Knoth
2011-02-03 21:43 ` [PATCH - hdspmixer 4/4] hdspmixer: Break overlong line and don't plenken Adrian Knoth
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.