From bb6c9222fb38ae26f4833ff3cc8e5584871cf733 Mon Sep 17 00:00:00 2001 From: Paul Dicker Date: Tue, 1 Apr 2025 07:17:06 +0200 Subject: [PATCH] Rename GuiDrawSpiralSegment to GuiSetSpiralSegmentColor --- src/dvdisaster.h | 2 +- src/read-adaptive-window.c | 6 +++--- src/read-linear-window.c | 12 ++++++------ src/rs01-verify.c | 2 +- src/rs02-verify.c | 2 +- src/rs03-verify.c | 2 +- src/spiral.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/dvdisaster.h b/src/dvdisaster.h index 167f5b6..abb74bc 100644 --- a/src/dvdisaster.h +++ b/src/dvdisaster.h @@ -1543,10 +1543,10 @@ void GuiFreeSpiral(Spiral*); void GuiFillSpiral(Spiral*, GdkColor*); void GuiDrawSpiral(Spiral*); -void GuiDrawSpiralSegment(Spiral*, GdkColor*, GdkColor*, int); void GuiDrawSpiralLabel(Spiral*, PangoLayout*, char*, GdkColor*, int, int); void GuiChangeSpiralCursor(Spiral*, int); void GuiMoveSpiralCursor(Spiral*, int); +void GuiSetSpiralSegmentColor(Spiral*, GdkColor*, GdkColor*, int); #else #define GuiChangeSpiralCursor(a, b) #define GuiFreeSpiral(s) diff --git a/src/read-adaptive-window.c b/src/read-adaptive-window.c index 2cbf017..fbf4456 100644 --- a/src/read-adaptive-window.c +++ b/src/read-adaptive-window.c @@ -195,14 +195,14 @@ static gboolean clip_idle_func(gpointer data) spiral->segmentClipping = spiral->segmentCount; for(i=clipping; i < spiral->segmentCount; i++) - GuiDrawSpiralSegment(spiral, Closure->background, Closure->background, i); + GuiSetSpiralSegmentColor(spiral, Closure->background, Closure->background, i); spiral->segmentClipping = clipping; /* Now redraw the last turn */ for(i=ADAPTIVE_READ_SPIRAL_SIZE-300; i<=clipping; i++) - GuiDrawSpiralSegment(spiral, Closure->background, 0, i); + GuiSetSpiralSegmentColor(spiral, Closure->background, 0, i); } return FALSE; @@ -243,7 +243,7 @@ static gboolean remove_fill_idle_func(gpointer data) for(i=0; isegmentCount; i++) if(spiral->segmentColor[i] == Closure->whiteSector) - GuiDrawSpiralSegment(spiral, Closure->background, 0, i); + GuiSetSpiralSegmentColor(spiral, Closure->background, 0, i); return FALSE; } diff --git a/src/read-linear-window.c b/src/read-linear-window.c index b0f876a..28f5e18 100644 --- a/src/read-linear-window.c +++ b/src/read-linear-window.c @@ -112,15 +112,15 @@ static gboolean curve_idle_func(gpointer data) gtk_label_set_text(GTK_LABEL(Closure->readLinearErrors), utf); g_free(utf); - /*** Draw the changed spiral segments */ + /*** Update color of the changed spiral segments */ for(i=rc->lastSegment; ipercent; i++) switch(Closure->readLinearCurve->ivalue[i]) - { case 0: GuiDrawSpiralSegment(Closure->readLinearSpiral, Closure->blueSector, 0, i); break; - case 1: GuiDrawSpiralSegment(Closure->readLinearSpiral, Closure->greenSector, 0, i); break; - case 2: GuiDrawSpiralSegment(Closure->readLinearSpiral, Closure->redSector, 0, i); break; - case 3: GuiDrawSpiralSegment(Closure->readLinearSpiral, Closure->darkSector, 0, i); break; - case 4: GuiDrawSpiralSegment(Closure->readLinearSpiral, Closure->yellowSector, 0, i); break; + { case 0: GuiSetSpiralSegmentColor(Closure->readLinearSpiral, Closure->blueSector, 0, i); break; + case 1: GuiSetSpiralSegmentColor(Closure->readLinearSpiral, Closure->greenSector, 0, i); break; + case 2: GuiSetSpiralSegmentColor(Closure->readLinearSpiral, Closure->redSector, 0, i); break; + case 3: GuiSetSpiralSegmentColor(Closure->readLinearSpiral, Closure->darkSector, 0, i); break; + case 4: GuiSetSpiralSegmentColor(Closure->readLinearSpiral, Closure->yellowSector, 0, i); break; } rc->lastSegment = ci->percent; diff --git a/src/rs01-verify.c b/src/rs01-verify.c index 696c5d1..3a6181a 100644 --- a/src/rs01-verify.c +++ b/src/rs01-verify.c @@ -78,7 +78,7 @@ static gboolean spiral_idle_func(gpointer data) int i; for(i=sii->from; i<=sii->to; i++) - GuiDrawSpiralSegment(sii->cmpSpiral, sii->segColor, 0, i-1); + GuiSetSpiralSegmentColor(sii->cmpSpiral, sii->segColor, 0, i-1); g_free(sii); return FALSE; diff --git a/src/rs02-verify.c b/src/rs02-verify.c index 229a56d..0803312 100644 --- a/src/rs02-verify.c +++ b/src/rs02-verify.c @@ -81,7 +81,7 @@ static gboolean spiral_idle_func(gpointer data) int i; for(i=sii->from; i<=sii->to; i++) - GuiDrawSpiralSegment(sii->cmpSpiral, sii->segColor, 0, i-1); + GuiSetSpiralSegmentColor(sii->cmpSpiral, sii->segColor, 0, i-1); g_free(sii); return FALSE; diff --git a/src/rs03-verify.c b/src/rs03-verify.c index 812f95c..78d2ab3 100644 --- a/src/rs03-verify.c +++ b/src/rs03-verify.c @@ -91,7 +91,7 @@ static gboolean spiral_idle_func(gpointer data) int i; for(i=sii->from; i<=sii->to; i++) - GuiDrawSpiralSegment(sii->cmpSpiral, sii->segColor, 0, i-1); + GuiSetSpiralSegmentColor(sii->cmpSpiral, sii->segColor, 0, i-1); g_free(sii); return FALSE; diff --git a/src/spiral.c b/src/spiral.c index e8f179c..353e196 100644 --- a/src/spiral.c +++ b/src/spiral.c @@ -164,7 +164,7 @@ void GuiDrawSpiral(Spiral *spiral) * Draw just one segment of the spiral */ -void GuiDrawSpiralSegment(Spiral *spiral, GdkColor *color, GdkColor *outline, int segment) +void GuiSetSpiralSegmentColor(Spiral *spiral, GdkColor *color, GdkColor *outline, int segment) { if(segment<0 || segment>=spiral->segmentClipping) return;