Refactor PixelDmx to use PixelOutputType by value

vanvught · vanvught · commit 0eff9f831add · 2025-12-07T12:24:12.000+01:00
Replaces the output_type_ pointer with a PixelOutputType instance, removing dynamic allocation and manual deletion. Updates all member accesses to use the object directly, simplifying memory management and improving code safety.
diff --git a/lib-pixeldmx/include/pixeldmx.h b/lib-pixeldmx/include/pixeldmx.h
@@ -85,9 +85,6 @@ class PixelDmx final : public PixelDmxConfiguration
     {
         DEBUG_ENTRY
 
-        delete output_type_;
-        output_type_ = nullptr;
-
         DEBUG_EXIT
     }
 
@@ -100,15 +97,8 @@ class PixelDmx final : public PixelDmxConfiguration
         PixelDmxConfiguration::Print();
 #endif
 
-        if (output_type_ != nullptr)
-        {
-            delete output_type_;
-            output_type_ = nullptr;
-        }
-
-        output_type_ = new PixelOutputType();
-        assert(output_type_ != nullptr);
-        output_type_->Blackout();
+         output_type_.ApplyConfiguration();
+        output_type_.Blackout();
 
         DEBUG_EXIT
     }
@@ -154,9 +144,9 @@ class PixelDmx final : public PixelDmxConfiguration
         assert(data != nullptr);
         assert(length <= dmxnode::kUniverseSize);
 
-        if (output_type_->IsUpdating())
+        if (output_type_.IsUpdating())
         {
-			puts("output_type_->IsUpdating()");
+			puts("output_type_.IsUpdating()");
             return;
         }
 
@@ -195,7 +185,7 @@ class PixelDmx final : public PixelDmxConfiguration
                         auto const kPixelIndexStart = (j * kGroupingCount);
                         for (uint32_t k = 0; k < kGroupingCount; k++)
                         {
-                            output_type_->SetPixel(kPixelIndexStart + k, data[d + 0], data[d + 1], data[d + 2]);
+                            output_type_.SetPixel(kPixelIndexStart + k, data[d + 0], data[d + 1], data[d + 2]);
                         }
                         d = d + 3;
                     }
@@ -206,7 +196,7 @@ class PixelDmx final : public PixelDmxConfiguration
                         auto const kPixelIndexStart = (j * kGroupingCount);
                         for (uint32_t k = 0; k < kGroupingCount; k++)
                         {
-                            output_type_->SetPixel(kPixelIndexStart + k, data[d + 0], data[d + 2], data[d + 1]);
+                            output_type_.SetPixel(kPixelIndexStart + k, data[d + 0], data[d + 2], data[d + 1]);
                         }
                         d = d + 3;
                     }
@@ -217,7 +207,7 @@ class PixelDmx final : public PixelDmxConfiguration
                         auto const kPixelIndexStart = (j * kGroupingCount);
                         for (uint32_t k = 0; k < kGroupingCount; k++)
                         {
-                            output_type_->SetPixel(kPixelIndexStart + k, data[d + 1], data[d + 0], data[d + 2]);
+                            output_type_.SetPixel(kPixelIndexStart + k, data[d + 1], data[d + 0], data[d + 2]);
                         }
                         d = d + 3;
                     }
@@ -228,7 +218,7 @@ class PixelDmx final : public PixelDmxConfiguration
                         auto const kPixelIndexStart = (j * kGroupingCount);
                         for (uint32_t k = 0; k < kGroupingCount; k++)
                         {
-                            output_type_->SetPixel(kPixelIndexStart + k, data[d + 2], data[d + 0], data[d + 1]);
+                            output_type_.SetPixel(kPixelIndexStart + k, data[d + 2], data[d + 0], data[d + 1]);
                         }
                         d = d + 3;
                     }
@@ -239,7 +229,7 @@ class PixelDmx final : public PixelDmxConfiguration
                         auto const kPixelIndexStart = (j * kGroupingCount);
                         for (uint32_t k = 0; k < kGroupingCount; k++)
                         {
-                            output_type_->SetPixel(kPixelIndexStart + k, data[d + 1], data[d + 2], data[d + 0]);
+                            output_type_.SetPixel(kPixelIndexStart + k, data[d + 1], data[d + 2], data[d + 0]);
                         }
                         d = d + 3;
                     }
@@ -250,7 +240,7 @@ class PixelDmx final : public PixelDmxConfiguration
                         auto const kPixelIndexStart = (j * kGroupingCount);
                         for (uint32_t k = 0; k < kGroupingCount; k++)
                         {
-                            output_type_->SetPixel(kPixelIndexStart + k, data[d + 2], data[d + 1], data[d + 0]);
+                            output_type_.SetPixel(kPixelIndexStart + k, data[d + 2], data[d + 1], data[d + 0]);
                         }
                         d = d + 3;
                     }
@@ -269,7 +259,7 @@ class PixelDmx final : public PixelDmxConfiguration
                 auto const kPixelIndexStart = (j * kGroupingCount);
                 for (uint32_t k = 0; k < kGroupingCount; k++)
                 {
-                    output_type_->SetPixel(kPixelIndexStart + k, data[d], data[d + 1], data[d + 2], data[d + 3]);
+                    output_type_.SetPixel(kPixelIndexStart + k, data[d], data[d + 1], data[d + 2], data[d + 3]);
                 }
                 d = d + 4;
             }
@@ -282,7 +272,7 @@ class PixelDmx final : public PixelDmxConfiguration
             {
                 return;
             }
-            output_type_->Update();
+            output_type_.Update();
         }
 #else
 #if !defined(SETDATA)
@@ -296,7 +286,7 @@ class PixelDmx final : public PixelDmxConfiguration
                 {
                     return;
                 }
-                output_type_->Update();
+                output_type_.Update();
             }
         }
 #endif
@@ -306,8 +296,7 @@ class PixelDmx final : public PixelDmxConfiguration
 
     void Sync()
     {
-        assert(output_type_ != nullptr);
-        output_type_->Update();
+        output_type_.Update();
     }
 
 #if defined(OUTPUT_HAVE_STYLESWITCH)
@@ -319,29 +308,29 @@ class PixelDmx final : public PixelDmxConfiguration
     {
         blackout_ = blackout;
 
-        while (output_type_->IsUpdating())
+        while (output_type_.IsUpdating())
         {
             // wait for completion
         }
 
         if (blackout)
         {
-            output_type_->Blackout();
+            output_type_.Blackout();
         }
         else
         {
-            output_type_->Update();
+            output_type_.Update();
         }
     }
 
     void FullOn()
     {
-        while (output_type_->IsUpdating())
+        while (output_type_.IsUpdating())
         {
             // wait for completion
         }
 
-        output_type_->FullOn();
+        output_type_.FullOn();
     }
 
     void Print() OVERRIDE { PixelDmxConfiguration::Get().Print(); }
@@ -419,7 +408,7 @@ class PixelDmx final : public PixelDmxConfiguration
     }
 
    private:
-    PixelOutputType* output_type_{nullptr};
+    PixelOutputType output_type_;
 
     bool started_{false};
     bool blackout_{false};

Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,6 @@ class PixelDmx final : public PixelDmxConfiguration`
`85`	`85`	`{`
`86`	`86`	`DEBUG_ENTRY`
`87`	`87`
`88`		`- delete output_type_;`
`89`		`- output_type_ = nullptr;`
`90`		`-`
`91`	`88`	`DEBUG_EXIT`
`92`	`89`	`}`
`93`	`90`
`@@ -100,15 +97,8 @@ class PixelDmx final : public PixelDmxConfiguration`
`100`	`97`	`PixelDmxConfiguration::Print();`
`101`	`98`	`#endif`
`102`	`99`
`103`		`- if (output_type_ != nullptr)`
`104`		`- {`
`105`		`- delete output_type_;`
`106`		`- output_type_ = nullptr;`
`107`		`- }`
`108`		`-`
`109`		`- output_type_ = new PixelOutputType();`
`110`		`- assert(output_type_ != nullptr);`
`111`		`- output_type_->Blackout();`
	`100`	`+ output_type_.ApplyConfiguration();`
	`101`	`+ output_type_.Blackout();`
`112`	`102`
`113`	`103`	`DEBUG_EXIT`
`114`	`104`	`}`
`@@ -154,9 +144,9 @@ class PixelDmx final : public PixelDmxConfiguration`
`154`	`144`	`assert(data != nullptr);`
`155`	`145`	`assert(length <= dmxnode::kUniverseSize);`
`156`	`146`
`157`		`- if (output_type_->IsUpdating())`
	`147`	`+ if (output_type_.IsUpdating())`
`158`	`148`	`{`
`159`		`- puts("output_type_->IsUpdating()");`
	`149`	`+ puts("output_type_.IsUpdating()");`
`160`	`150`	`return;`
`161`	`151`	`}`
`162`	`152`
`@@ -195,7 +185,7 @@ class PixelDmx final : public PixelDmxConfiguration`
`195`	`185`	`auto const kPixelIndexStart = (j * kGroupingCount);`
`196`	`186`	`for (uint32_t k = 0; k < kGroupingCount; k++)`
`197`	`187`	`{`
`198`		`- output_type_->SetPixel(kPixelIndexStart + k, data[d + 0], data[d + 1], data[d + 2]);`
	`188`	`+ output_type_.SetPixel(kPixelIndexStart + k, data[d + 0], data[d + 1], data[d + 2]);`
`199`	`189`	`}`
`200`	`190`	`d = d + 3;`
`201`	`191`	`}`
`@@ -206,7 +196,7 @@ class PixelDmx final : public PixelDmxConfiguration`
`206`	`196`	`auto const kPixelIndexStart = (j * kGroupingCount);`
`207`	`197`	`for (uint32_t k = 0; k < kGroupingCount; k++)`
`208`	`198`	`{`
`209`		`- output_type_->SetPixel(kPixelIndexStart + k, data[d + 0], data[d + 2], data[d + 1]);`
	`199`	`+ output_type_.SetPixel(kPixelIndexStart + k, data[d + 0], data[d + 2], data[d + 1]);`
`210`	`200`	`}`
`211`	`201`	`d = d + 3;`
`212`	`202`	`}`
`@@ -217,7 +207,7 @@ class PixelDmx final : public PixelDmxConfiguration`
`217`	`207`	`auto const kPixelIndexStart = (j * kGroupingCount);`
`218`	`208`	`for (uint32_t k = 0; k < kGroupingCount; k++)`
`219`	`209`	`{`
`220`		`- output_type_->SetPixel(kPixelIndexStart + k, data[d + 1], data[d + 0], data[d + 2]);`
	`210`	`+ output_type_.SetPixel(kPixelIndexStart + k, data[d + 1], data[d + 0], data[d + 2]);`
`221`	`211`	`}`
`222`	`212`	`d = d + 3;`
`223`	`213`	`}`
`@@ -228,7 +218,7 @@ class PixelDmx final : public PixelDmxConfiguration`
`228`	`218`	`auto const kPixelIndexStart = (j * kGroupingCount);`
`229`	`219`	`for (uint32_t k = 0; k < kGroupingCount; k++)`
`230`	`220`	`{`
`231`		`- output_type_->SetPixel(kPixelIndexStart + k, data[d + 2], data[d + 0], data[d + 1]);`
	`221`	`+ output_type_.SetPixel(kPixelIndexStart + k, data[d + 2], data[d + 0], data[d + 1]);`
`232`	`222`	`}`
`233`	`223`	`d = d + 3;`
`234`	`224`	`}`
`@@ -239,7 +229,7 @@ class PixelDmx final : public PixelDmxConfiguration`
`239`	`229`	`auto const kPixelIndexStart = (j * kGroupingCount);`
`240`	`230`	`for (uint32_t k = 0; k < kGroupingCount; k++)`
`241`	`231`	`{`
`242`		`- output_type_->SetPixel(kPixelIndexStart + k, data[d + 1], data[d + 2], data[d + 0]);`
	`232`	`+ output_type_.SetPixel(kPixelIndexStart + k, data[d + 1], data[d + 2], data[d + 0]);`
`243`	`233`	`}`
`244`	`234`	`d = d + 3;`
`245`	`235`	`}`
`@@ -250,7 +240,7 @@ class PixelDmx final : public PixelDmxConfiguration`
`250`	`240`	`auto const kPixelIndexStart = (j * kGroupingCount);`
`251`	`241`	`for (uint32_t k = 0; k < kGroupingCount; k++)`
`252`	`242`	`{`
`253`		`- output_type_->SetPixel(kPixelIndexStart + k, data[d + 2], data[d + 1], data[d + 0]);`
	`243`	`+ output_type_.SetPixel(kPixelIndexStart + k, data[d + 2], data[d + 1], data[d + 0]);`
`254`	`244`	`}`
`255`	`245`	`d = d + 3;`
`256`	`246`	`}`
`@@ -269,7 +259,7 @@ class PixelDmx final : public PixelDmxConfiguration`
`269`	`259`	`auto const kPixelIndexStart = (j * kGroupingCount);`
`270`	`260`	`for (uint32_t k = 0; k < kGroupingCount; k++)`
`271`	`261`	`{`
`272`		`- output_type_->SetPixel(kPixelIndexStart + k, data[d], data[d + 1], data[d + 2], data[d + 3]);`
	`262`	`+ output_type_.SetPixel(kPixelIndexStart + k, data[d], data[d + 1], data[d + 2], data[d + 3]);`
`273`	`263`	`}`
`274`	`264`	`d = d + 4;`
`275`	`265`	`}`
`@@ -282,7 +272,7 @@ class PixelDmx final : public PixelDmxConfiguration`
`282`	`272`	`{`
`283`	`273`	`return;`
`284`	`274`	`}`
`285`		`- output_type_->Update();`
	`275`	`+ output_type_.Update();`
`286`	`276`	`}`
`287`	`277`	`#else`
`288`	`278`	`#if !defined(SETDATA)`
`@@ -296,7 +286,7 @@ class PixelDmx final : public PixelDmxConfiguration`
`296`	`286`	`{`
`297`	`287`	`return;`
`298`	`288`	`}`
`299`		`- output_type_->Update();`
	`289`	`+ output_type_.Update();`
`300`	`290`	`}`
`301`	`291`	`}`
`302`	`292`	`#endif`
`@@ -306,8 +296,7 @@ class PixelDmx final : public PixelDmxConfiguration`
`306`	`296`
`307`	`297`	`void Sync()`
`308`	`298`	`{`
`309`		`- assert(output_type_ != nullptr);`
`310`		`- output_type_->Update();`
	`299`	`+ output_type_.Update();`
`311`	`300`	`}`
`312`	`301`
`313`	`302`	`#if defined(OUTPUT_HAVE_STYLESWITCH)`
`@@ -319,29 +308,29 @@ class PixelDmx final : public PixelDmxConfiguration`
`319`	`308`	`{`
`320`	`309`	`blackout_ = blackout;`
`321`	`310`
`322`		`- while (output_type_->IsUpdating())`
	`311`	`+ while (output_type_.IsUpdating())`
`323`	`312`	`{`
`324`	`313`	`// wait for completion`
`325`	`314`	`}`
`326`	`315`
`327`	`316`	`if (blackout)`
`328`	`317`	`{`
`329`		`- output_type_->Blackout();`
	`318`	`+ output_type_.Blackout();`
`330`	`319`	`}`
`331`	`320`	`else`
`332`	`321`	`{`
`333`		`- output_type_->Update();`
	`322`	`+ output_type_.Update();`
`334`	`323`	`}`
`335`	`324`	`}`
`336`	`325`
`337`	`326`	`void FullOn()`
`338`	`327`	`{`
`339`		`- while (output_type_->IsUpdating())`
	`328`	`+ while (output_type_.IsUpdating())`
`340`	`329`	`{`
`341`	`330`	`// wait for completion`
`342`	`331`	`}`
`343`	`332`
`344`		`- output_type_->FullOn();`
	`333`	`+ output_type_.FullOn();`
`345`	`334`	`}`
`346`	`335`
`347`	`336`	`void Print() OVERRIDE { PixelDmxConfiguration::Get().Print(); }`
`@@ -419,7 +408,7 @@ class PixelDmx final : public PixelDmxConfiguration`
`419`	`408`	`}`
`420`	`409`
`421`	`410`	`private:`
`422`		`- PixelOutputType* output_type_{nullptr};`
	`411`	`+ PixelOutputType output_type_;`
`423`	`412`
`424`	`413`	`bool started_{false};`
`425`	`414`	`bool blackout_{false};`