Fixed: ini file quoted paths, RPROG_OHM parameter error

oleg-it-com · oleg-it-com · commit 5429300af1d4 · 2013-08-01T13:24:44.000+06:00
diff --git a/bsp/bsp.cmake b/bsp/bsp.cmake
@@ -18,8 +18,9 @@ if(PLATFORM STREQUAL "N1100")
   endif()
   if(NOT RPROG_OHM)
     MESSAGE(STATUS "No RPROG_OHM specified, using default: 2000")
-    add_definitions(-DRPROG_OHM=2000)
+    set (RPROG_OHM 2000)
   endif()
+  add_definitions(-DRPROG_OHM=${RPROG_OHM})
 elseif(PLATFORM STREQUAL "F4DISCOVERY")
   add_definitions(-DF4DISCOVERY)
   set (USE_HOST_MODE 1)
diff --git a/src/player/player.c b/src/player/player.c
@@ -90,10 +90,8 @@ void Player_Init(void)
 
   Navigator_InitRoot(&PlayerContext, suffixes_white_list);
 
-#ifndef PROFILING
   char buf[256];
 
-  //todo len???, null-terminated???
   int len;
   len = ini_gets("file", "path", "", buf, sizeof(buf), PLAYER_INI_FILE);
   if (len)
@@ -140,7 +138,6 @@ void Player_Init(void)
     }
   }
   else
-#endif
   {
     Navigator_NextFile(&PlayerContext);
 
@@ -465,13 +462,13 @@ void Player_SaveState(void)
   {
     f_puts("[file]\n", &f);
 
-    f_printf(&f, "path=");
+    f_printf(&f, "path=\"");
     f_puts(PlayerContext.dir_path, &f);
-    f_printf(&f, "\n");
+    f_printf(&f, "\"\n");
 
-    f_printf(&f, "name=");
+    f_printf(&f, "name=\"");
     f_puts(PlayerContext.fname, &f);
-    f_printf(&f, "\n");
+    f_printf(&f, "\"\n");
 
     f_printf(&f, "mstime=%u\n", PlayerState.metadata.mstime_curr);
   }

Original file line number	Diff line number	Diff line change
`@@ -90,10 +90,8 @@ void Player_Init(void)`
`90`	`90`
`91`	`91`	`Navigator_InitRoot(&PlayerContext, suffixes_white_list);`
`92`	`92`
`93`		`-#ifndef PROFILING`
`94`	`93`	`char buf[256];`
`95`	`94`
`96`		`- //todo len???, null-terminated???`
`97`	`95`	`int len;`
`98`	`96`	`len = ini_gets("file", "path", "", buf, sizeof(buf), PLAYER_INI_FILE);`
`99`	`97`	`if (len)`
`@@ -140,7 +138,6 @@ void Player_Init(void)`
`140`	`138`	`}`
`141`	`139`	`}`
`142`	`140`	`else`
`143`		`-#endif`
`144`	`141`	`{`
`145`	`142`	`Navigator_NextFile(&PlayerContext);`
`146`	`143`
`@@ -465,13 +462,13 @@ void Player_SaveState(void)`
`465`	`462`	`{`
`466`	`463`	`f_puts("[file]\n", &f);`
`467`	`464`
`468`		`- f_printf(&f, "path=");`
	`465`	`+ f_printf(&f, "path=\"");`
`469`	`466`	`f_puts(PlayerContext.dir_path, &f);`
`470`		`- f_printf(&f, "\n");`
	`467`	`+ f_printf(&f, "\"\n");`
`471`	`468`
`472`		`- f_printf(&f, "name=");`
	`469`	`+ f_printf(&f, "name=\"");`
`473`	`470`	`f_puts(PlayerContext.fname, &f);`
`474`		`- f_printf(&f, "\n");`
	`471`	`+ f_printf(&f, "\"\n");`
`475`	`472`
`476`	`473`	`f_printf(&f, "mstime=%u\n", PlayerState.metadata.mstime_curr);`
`477`	`474`	`}`