fix sa

esp-cpp · Dec 28, 2023 · 38c7ea8 · 38c7ea8
1 parent a7daa47
commit 38c7ea8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/components/nes/src/video_audio.c b/components/nes/src/video_audio.c
@@ -120,7 +120,7 @@ static void set_palette(rgb_t *pal);
 static void clear(uint8 color);
 static bitmap_t *lock_write(void);
 static void free_write(int num_dirties, rect_t *dirty_rects);
-static void custom_blit(bitmap_t *bmp, int num_dirties, rect_t *dirty_rects);
+static void custom_blit(const bitmap_t *bmp, int num_dirties, rect_t *dirty_rects);
 
 QueueHandle_t vidQueue;
 
@@ -134,7 +134,7 @@ viddriver_t sdlDriver =
    clear,         /* clear */
    lock_write,    /* lock_write */
    free_write,    /* free_write */
-   custom_blit,   /* custom_blit */
+   (void (*)(bitmap_t *, int,  rect_t *))custom_blit,   /* custom_blit */
    false          /* invalidate flag */
 };
 
@@ -283,7 +283,7 @@ static void free_write(int num_dirties, rect_t *dirty_rects)
    bmp_destroy(&myBitmap);
 }
 
-static void custom_blit(bitmap_t *bmp, int num_dirties, rect_t *dirty_rects) {
+static void custom_blit(const bitmap_t *bmp, int num_dirties, rect_t *dirty_rects) {
     uint8_t *lcdfb = get_frame_buffer0();
     if (bmp->line[0] != NULL)
     {
@@ -448,10 +448,7 @@ int osd_init()
 {
 	log_chain_logfunc(logprint);
 
-	if (osd_init_sound())
-    {
-        abort();
-    }
+	osd_init_sound();
 
 	vidQueue=xQueueCreate(1, sizeof(bitmap_t *));
 	xTaskCreatePinnedToCore(&videoTask, "videoTask", 6*1024, NULL, 20, NULL, 1);

diff --git a/main/cart.hpp b/main/cart.hpp
@@ -44,7 +44,6 @@ class Cart {
     // copy the romdata
     rom_size_bytes_ = copy_romdata_to_cart_partition(get_rom_filename());
     romdata_ = get_mmapped_romdata();
-    handle_video_setting();
     // create the menu
     menu_ = std::make_unique<Menu>(Menu::Config{
         .display = display_,

diff --git a/main/gbc_cart.hpp b/main/gbc_cart.hpp
@@ -10,6 +10,7 @@ class GbcCart : public Cart {
 
   explicit GbcCart(const Cart::Config& config)
     : Cart(config) {
+    handle_video_setting();
     init();
   }
 

diff --git a/main/nes_cart.hpp b/main/nes_cart.hpp
@@ -10,6 +10,7 @@ class NesCart : public Cart {
 
   explicit NesCart(const Cart::Config& config)
     : Cart(config) {
+    handle_video_setting();
     init();
   }
 
@@ -98,21 +99,18 @@ class NesCart : public Cart {
 #endif
   }
 
-  // cppcheck-suppress uselessOverride
   virtual void set_original_video_setting() override {
 #if defined(ENABLE_NES)
     set_nes_video_original();
 #endif
   }
 
-  // cppcheck-suppress uselessOverride
   virtual void set_fit_video_setting() override {
 #if defined(ENABLE_NES)
     set_nes_video_fit();
 #endif
   }
 
-  // cppcheck-suppress uselessOverride
   virtual void set_fill_video_setting() override {
 #if defined(ENABLE_NES)
     set_nes_video_fill();

diff --git a/main/sms_cart.hpp b/main/sms_cart.hpp
@@ -10,6 +10,7 @@ class SmsCart : public Cart {
 
   explicit SmsCart(const Cart::Config& config)
     : Cart(config) {
+    handle_video_setting();
     init();
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ class GbcCart : public Cart { @@
       explicit GbcCart(const Cart::Config& config)
         : Cart(config) {
+        handle_video_setting();
         init();
       }
@@ Expand Down @@