Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

cp: update video input settings when loading a performance file

  • Loading branch information...
commit 1047f8b52b327aea99d339a039860af12519ad9b 1 parent 9f4a0b5
Sébastien Bourdeauducq authored
1  src/gui/cp.c
@@ -72,6 +72,7 @@ static void on_config_change()
72 72
 	/* reload config for controls that need modification of some state */
73 73
 	load_audio_config();
74 74
 	load_dmx_config();
  75
+	load_videoin_config();
75 76
 }
76 77
 
77 78
 static void loadok_callback(void *arg)
6  src/gui/videoin.c
@@ -114,7 +114,7 @@ static void format_callback(mtk_event *e, void *arg)
114 114
 	set_format((int)arg);
115 115
 }
116 116
 
117  
-static void load_config()
  117
+void load_videoin_config()
118 118
 {
119 119
 	set_format(config_read_int("vin_format", VIDEO_FORMAT_CVBS6));
120 120
 
@@ -187,7 +187,7 @@ static void close_videoin_window()
187 187
 {
188 188
 	input_delete_callback(preview_update);
189 189
 	mtk_cmd(appid, "w.close()");
190  
-	load_config();
  190
+	load_videoin_config();
191 191
 	close(video_fd);
192 192
 	w_open = 0;
193 193
 	resmgr_release(RESOURCE_VIDEOIN);
@@ -323,7 +323,7 @@ void open_videoin_window()
323 323
 	}
324 324
 	
325 325
 	w_open = 1;
326  
-	load_config();
  326
+	load_videoin_config();
327 327
 	next_update = rtems_clock_get_ticks_since_boot() + UPDATE_PERIOD;
328 328
 	input_add_callback(preview_update);
329 329
 	mtk_cmd(appid, "w.open()");
3  src/gui/videoin.h
... ...
@@ -1,6 +1,6 @@
1 1
 /*
2 2
  * Flickernoise
3  
- * Copyright (C) 2010 Sebastien Bourdeauducq
  3
+ * Copyright (C) 2010, 2011 Sebastien Bourdeauducq
4 4
  *
5 5
  * This program is free software: you can redistribute it and/or modify
6 6
  * it under the terms of the GNU General Public License as published by
@@ -20,5 +20,6 @@
20 20
 
21 21
 void init_videoin();
22 22
 void open_videoin_window();
  23
+void load_videoin_config();
23 24
 
24 25
 #endif /* __VIDEOIN_H */

0 notes on commit 1047f8b

Please sign in to comment.
Something went wrong with that request. Please try again.