Refactor option setting code:

* Remove all duplicated display setters in switchres_manager. These are
  now set directly in the display_factory member, then passed later to
  individual display objects when they are created.

* Implement sr_set_option api call, so now any configuration option
  that's available in inis can also be set programmatically by this
  call, e.g.:
		sr_set_option("dotclock_min", "25.0");

* Multi-monitor logic is preserved by means of sr_set_disp(), which
  tells Switchres which display to target in subsequent calls (like
  sr_set_option, etc.) Current display tracking has been moved to
  switchres_manager.

* When a display is added, it is set as the current one with regards
  to subsequent calls. sr_set_disp(-1) can be called to point to the
  the display_factory one if needed.

Author: antonioginer

Diff for: display.cpp

@@ -46,7 +46,8 @@ display_manager *display_manager::make(display_settings *ds)
 		display = new sdl2_display(ds);
 	}
 	catch (...) {};
-	if ( ! display ) {
+	if (!display)
+	{
 #endif
 
 #if defined(_WIN32)
@@ -103,6 +104,7 @@ void display_manager::parse_options()
 void display_manager::set_preset(const char *preset)
 {
 	strncpy(m_ds.monitor, preset, sizeof(m_ds.monitor)-1);
+	for (size_t i = 0; i < strlen(m_ds.monitor); i++) m_ds.monitor[i] = tolower(m_ds.monitor[i]);
 
 	memset(&range[0], 0, sizeof(struct monitor_range) * MAX_RANGES);
 
@@ -521,3 +523,24 @@ bool display_manager::auto_specs()
 
 	return true;
 }
+
+//============================================================
+//  display_manager::get_aspect
+//============================================================
+
+double display_manager::get_aspect(const char* aspect)
+{
+	int num, den;
+	if (sscanf(aspect, "%d:%d", &num, &den) == 2)
+	{
+		if (den == 0)
+		{
+			log_error("Error: denominator can't be zero\n");
+			return STANDARD_CRT_ASPECT;
+		}
+		return (double(num)/double(den));
+	}
+
+	log_error("Error: use format --aspect <num:den>\n");
+	return STANDARD_CRT_ASPECT;
+}

Diff for: display.h

@@ -154,6 +154,7 @@ class display_manager
 	void set_refresh_tolerance(double value) { m_ds.gs.refresh_tolerance = value; }
 	void set_super_width(int value) { m_ds.gs.super_width = value; }
 	void set_monitor_aspect(double value) { m_ds.gs.monitor_aspect = value; }
+	void set_monitor_aspect(const char* aspect) { set_monitor_aspect(get_aspect(aspect)); }
 	void set_h_size(double value) { m_ds.gs.h_size = value; }
 	void set_h_shift(int value) { m_ds.gs.h_shift = value; }
 	void set_v_shift(int value) { m_ds.gs.v_shift = value; }
@@ -209,6 +210,7 @@ class display_manager
 	int m_id_counter = 0;
 
 	void set_preset(const char *preset);
+	double get_aspect(const char* aspect);
 
 protected:
 	void* m_pf_data = nullptr;

Diff for: edid.cpp

@@ -22,7 +22,7 @@
 //  edid_from_modeline
 //============================================================
 
-int edid_from_modeline(modeline *mode, monitor_range *range, char *name, edid_block *edid)
+int edid_from_modeline(modeline *mode, monitor_range *range, const char *name, edid_block *edid)
 {
 	if (!edid) return 0;
 

Diff for: edid.h

@@ -32,6 +32,6 @@ typedef struct edid_block
 //  PROTOTYPES
 //============================================================
 
-int edid_from_modeline(modeline *mode, monitor_range *range, char *name, edid_block *edid);
+int edid_from_modeline(modeline *mode, monitor_range *range, const char *name, edid_block *edid);
 
 #endif

Diff for: examples/multi_monitor.cpp

@@ -10,9 +10,11 @@ int main(int argc, char** argv)
 	sr_init();
 	sr_set_log_level(3);
 
+	sr_set_disp(-1);
 	sr_set_monitor("arcade_31");
 	sr_init_disp("0", NULL);
 
+	sr_set_disp(-1);
 	sr_set_monitor("pc_31_120");
 	sr_init_disp("1", NULL);
 

Diff for: modeline.cpp

@@ -622,7 +622,7 @@ int modeline_parse(const char *user_modeline, modeline *mode)
 
 	if (e != 9)
 	{
-		log_error("SwitchRes: missing parameter in user modeline\n  %s\n", user_modeline);
+		log_error("Switchres: missing parameter in user modeline\n  %s\n", user_modeline);
 		memset(mode, 0, sizeof(struct modeline));
 		return false;
 	}
@@ -634,7 +634,7 @@ int modeline_parse(const char *user_modeline, modeline *mode)
 	mode->refresh = mode->vfreq;
 	mode->width = mode->hactive;
 	mode->height = mode->vactive;
-	log_verbose("SwitchRes: user modeline %s\n", modeline_print(mode, modeline_txt, MS_FULL));
+	log_verbose("Switchres: user modeline %s\n", modeline_print(mode, modeline_txt, MS_FULL));
 
 	return true;
 }
@@ -645,11 +645,8 @@ int modeline_parse(const char *user_modeline, modeline *mode)
 
 int modeline_to_monitor_range(monitor_range *range, modeline *mode)
 {
-	if (range->vfreq_min == 0)
-	{
-		range->vfreq_min = mode->vfreq - 0.2;
-		range->vfreq_max = mode->vfreq + 0.2;
-	}
+	range->vfreq_min = mode->vfreq - 0.2;
+	range->vfreq_max = mode->vfreq + 0.2;
 
 	double line_time = 1 / mode->hfreq;
 	double pixel_time = line_time / mode->htotal * 1000000;