Revert "atmo: add support for new device fnordlicht"

[vlc] / modules / video_filter / atmo / atmo.cpp

diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp
index 0bdc46798383ef1ba62a7b812a4b7892d8f41dba..addb87c8e6a23ebe3b983bc7dd4c736cac19f864 100644 (file)
--- a/modules/video_filter/atmo/atmo.cpp
+++ b/modules/video_filter/atmo/atmo.cpp
@@ -139,8 +139,7 @@ static const int pi_device_type_values[] = {
      1, /* AtmoLight classic */
      2, /* Quattro AtmoLight */
      3, /* DMX Device */
-     4, /* MoMoLight device */
-        5  /* fnordlicht */
+     4  /* MoMoLight device */
 };
 static const char *const ppsz_device_type_descriptions[] = {
 #if defined( WIN32 )
@@ -149,8 +148,7 @@ static const char *const ppsz_device_type_descriptions[] = {
         N_("Classic AtmoLight"),
         N_("Quattro AtmoLight"),
         N_("DMX"),
-        N_("MoMoLight"),
-        N_("fnordlicht")
+        N_("MoMoLight")
 };
 
 #define DMX_CHANNELS_TEXT      N_("Count of AtmoLight channels")
@@ -164,11 +162,6 @@ static const char *const ppsz_device_type_descriptions[] = {
 #define MOMO_CHANNELS_LONGTEXT  N_("Depending on your MoMoLight hardware " \
                                    "choose 3 or 4 channels")
 
-#define FNORDLICHT_AMOUNT_TEXT      N_("Count of fnordlicht's")
-#define FNORDLICHT_AMOUNT_LONGTEXT  N_("Depending on the amount your " \
-                                   "fnordlicht hardware " \
-                                   "choose 1 to 4 channels")
-
 #if defined( WIN32 )
 #  define DEFAULT_DEVICE   0
 #else
@@ -383,7 +376,7 @@ add_string(CFG_PREFIX "serialdev", "COM1", NULL,
 add_file(CFG_PREFIX "atmowinexe", NULL, NULL,
          ATMOWINEXE_TEXT, ATMOWINEXE_LONGTEXT, false )
 #else
-add_string(CFG_PREFIX "serialdev", "/dev/ttyUSB0", NULL,
+add_string(CFG_PREFIX "serialdev", "/dev/ttyS01", NULL,
            SERIALDEV_TEXT, SERIALDEV_LONGTEXT, false )
 #endif
 
@@ -428,13 +421,6 @@ set_section( N_("MoMoLight options" ), 0 )
 add_integer_with_range(CFG_PREFIX "momo-channels",   3, 3, 4, NULL,
                        MOMO_CHANNELS_TEXT, MOMO_CHANNELS_LONGTEXT, false)
 
-/* 2,2,4 means 2 is the default value, 1 minimum amount,
-   4 maximum amount
-*/
-set_section( N_("fnordlicht options" ), 0 )
-add_integer_with_range(CFG_PREFIX "fnordlicht-amount",   2, 1, 4, NULL,
-                       FNORDLICHT_AMOUNT_TEXT,
-                       FNORDLICHT_AMOUNT_LONGTEXT, false)
 
 
 /*
@@ -666,7 +652,6 @@ static const char *const ppsz_filter_options[] = {
         "dmx-channels",
         "dmx-chbase",
         "momo-channels",
-        "fnordlicht-amount",
 
 #if defined(WIN32 )
         "atmowinexe",
@@ -1538,14 +1523,6 @@ static void Atmo_SetupConfig(filter_t *p_filter, CAtmoConfig *p_atmo_config)
     p_atmo_config->setMoMo_Channels(
         var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "momo-channels")
        );
-
-    /*
-      fnordlicht options
-    */
-    p_atmo_config->setFnordlicht_Amount(
-        var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "fnordlicht-amount")
-       );
-
 }
 
 
@@ -1626,58 +1603,48 @@ static void Atmo_SetupParameters(filter_t *p_filter)
 
             /* importing all required functions I hope*/
             p_sys->pf_ctrl_atmo_initialize =
-                (int32_t (*)(void))GetProcAddress( p_sys->h_AtmoCtrl,
-                                                   "AtmoInitialize");
+                (int32_t (*)(void))GetProcAddress(p_sys->h_AtmoCtrl,"AtmoInitialize");
             if(!p_sys->pf_ctrl_atmo_initialize)
                 msg_Err( p_filter, "export AtmoInitialize missing.");
 
             p_sys->pf_ctrl_atmo_finalize =
-                (void (*)(int32_t))GetProcAddress( p_sys->h_AtmoCtrl,
-                                                                              "AtmoFinalize");
+                (void (*)(int32_t))GetProcAddress(p_sys->h_AtmoCtrl,"AtmoFinalize");
             if(!p_sys->pf_ctrl_atmo_finalize)
                 msg_Err( p_filter, "export AtmoFinalize missing.");
 
             p_sys->pf_ctrl_atmo_switch_effect =
-                (int32_t(*)(int32_t))GetProcAddress( p_sys->h_AtmoCtrl,
-                                                                                "AtmoSwitchEffect" );
+                (int32_t(*)(int32_t))GetProcAddress(p_sys->h_AtmoCtrl,"AtmoSwitchEffect");
             if(!p_sys->pf_ctrl_atmo_switch_effect)
                 msg_Err( p_filter, "export AtmoSwitchEffect missing.");
 
             p_sys->pf_ctrl_atmo_set_live_source =
-                (int32_t(*)(int32_t))GetProcAddress( p_sys->h_AtmoCtrl,
-                                                                                "AtmoSetLiveSource" );
+                (int32_t(*)(int32_t))GetProcAddress(p_sys->h_AtmoCtrl,"AtmoSetLiveSource");
             if(!p_sys->pf_ctrl_atmo_set_live_source)
                 msg_Err( p_filter, "export AtmoSetLiveSource missing.");
 
             p_sys->pf_ctrl_atmo_create_transfer_buffers =
-                (void (*)(int32_t, int32_t, int32_t , int32_t))
-                                       GetProcAddress( p_sys->h_AtmoCtrl,
-                                    "AtmoCreateTransferBuffers" );
+                (void (*)(int32_t, int32_t, int32_t , int32_t))GetProcAddress(p_sys->h_AtmoCtrl,"AtmoCreateTransferBuffers");
             if(!p_sys->pf_ctrl_atmo_create_transfer_buffers)
                 msg_Err( p_filter, "export AtmoCreateTransferBuffers missing.");
 
             p_sys->pf_ctrl_atmo_lock_transfer_buffer=
-                (uint8_t*(*) (void))GetProcAddress( p_sys->h_AtmoCtrl,
-                                                                               "AtmoLockTransferBuffer");
+                (uint8_t*(*) (void))GetProcAddress(p_sys->h_AtmoCtrl,"AtmoLockTransferBuffer");
             if(!p_sys->pf_ctrl_atmo_lock_transfer_buffer)
                 msg_Err( p_filter, "export AtmoLockTransferBuffer missing.");
 
             p_sys->pf_ctrl_atmo_send_pixel_data =
-                (void (*)(void))GetProcAddress( p_sys->h_AtmoCtrl,
-                                                                           "AtmoSendPixelData");
+                (void (*)(void))GetProcAddress(p_sys->h_AtmoCtrl,"AtmoSendPixelData");
             if(!p_sys->pf_ctrl_atmo_send_pixel_data)
                 msg_Err( p_filter, "export AtmoSendPixelData missing.");
 
             p_sys->pf_ctrl_atmo_get_image_size =
-                (void (*)(int32_t*,int32_t*))GetProcAddress( p_sys->h_AtmoCtrl,
-                                                                            "AtmoWinGetImageSize");
+                (void (*)(int32_t*,int32_t*))GetProcAddress(p_sys->h_AtmoCtrl,"AtmoWinGetImageSize");
             if(!p_sys->pf_ctrl_atmo_get_image_size)
                 msg_Err( p_filter, "export AtmoWinGetImageSize missing.");
 
         } else {
             /* the DLL is missing try internal filter ...*/
-            msg_Warn( p_filter,
-                               "AtmoCtrlLib.dll missing fallback to internal atmo classic driver" );
+            msg_Warn( p_filter, "AtmoCtrlLib.dll missing fallback to internal atmo classic driver");
             p_sys->i_device_type = 1;
         }
     }
@@ -1717,10 +1684,6 @@ static void Atmo_SetupParameters(filter_t *p_filter)
                 p_sys->p_atmo_config->setConnectionType( actMoMoLight );
                 break;
 
-            case 5:
-                p_sys->p_atmo_config->setConnectionType( actFnordlicht );
-                break;
-
             default:
                 msg_Warn( p_filter, "invalid device type %d found",
                                     p_sys->i_device_type );
@@ -2264,8 +2227,7 @@ static void CreateMiniImage( filter_t *p_filter, picture_t *p_inpic)
         }
     }
 
-    msg_Dbg( p_filter, "AtmoFrame %u Time: %d ms", p_sys->ui_frame_counter,
-                               mdate() / 1000);
+    msg_Dbg( p_filter, "AtmoFrame %u Time: %d ms", p_sys->ui_frame_counter, mdate() / 1000);
     p_sys->ui_frame_counter++;
 #endif
 
@@ -2570,7 +2532,7 @@ static int AtmoSettingsCallback( vlc_object_t *p_this, char const *psz_var,
        );
 
         if( !strcmp( psz_var, CFG_PREFIX "filtermode" ))
-            p_atmo_config->setLiveViewFilterMode( (AtmoFilterMode)newval.i_int );
+            p_atmo_config->setLiveViewFilterMode( (AtmoFilterMode)newval.i_int);
 
         else if( !strcmp( psz_var, CFG_PREFIX "percentnew" ))
                  p_atmo_config->setLiveViewFilter_PercentNew( newval.i_int );
@@ -2800,14 +2762,10 @@ static void atmo_parse_crop(char *psz_cropconfig,
             i_crop_bottom = strtol( psz_end, &psz_end, 10 );
             if( *psz_end != '\0' ) return;
 
-            i_width = fmt_render.i_visible_width -
-                                               i_crop_left -
-                                               i_crop_right;
+            i_width = fmt_render.i_visible_width - i_crop_left - i_crop_right;
             i_visible_width = i_width;
 
-            i_height = fmt_render.i_visible_height -
-                                               i_crop_top -
-                                               i_crop_bottom;
+            i_height = fmt_render.i_visible_height - i_crop_top - i_crop_bottom;
             i_visible_height = i_height;
 
             i_x_offset = i_crop_left;