OSDN > Pesquisar Software > Software Development > csp-qt > SCM > git > common_source_project-fm7 > Commit

csp-qt
Fork

common_source_project-fm7: Commit

Common Source Code Project for Qt (a.k.a for FM-7).

Revisão	72f9093133b9cb9afc2052a7346476b1dcac0990 (tree)
Hora	2020-10-24 17:55:12
Autor	K.Ohta <whatisthis.sowhat@gmai...>
Commiter	K.Ohta

[OSD][Qt] Fix linkage error at WIN32.

--- a/source/src/qt/gui/CMakeLists.txt

+++ b/source/src/qt/gui/CMakeLists.txt

		@@ -159,8 +159,7 @@ add_library(CSPgui SHARED
159	159	)
160	160
161	161	target_link_libraries(CSPgui
162		- PRIVATE CSPosd
163		- # ${LIBAV_LIBRARIES}
	162	+ PRIVATE CSPosd
164	163	CSPavio
165	164	CSPemu_utils
166	165	Qt5::Core

--- a/source/src/qt/osd.h

+++ b/source/src/qt/osd.h

		@@ -110,7 +110,10 @@ public:
110	110	void recv_socket_data(int ch);
111	111	SOCKET get_socket(int ch);
112	112
113		-
	113	+ // Misc
	114	+ double get_vm_current_usec();
	115	+ uint64_t get_vm_current_clock_uint64();
	116	+
114	117	public slots:
115	118	void do_decode_movie(int frames);
116	119	void do_run_movie_audio_callback(uint8_t *data, long len);

--- a/source/src/qt/osd_base.cpp

+++ b/source/src/qt/osd_base.cpp

		@@ -426,18 +426,6 @@ int OSD_BASE::get_vm_node_size(void)
426	426	return max_vm_nodes;
427	427	}
428	428
429		-double OSD_BASE::get_vm_current_usec()
430		-{
431		- if(vm == NULL) return 0.0;
432		- return vm->get_current_usec();
433		-}
434		-
435		-uint64_t OSD_BASE::get_vm_current_clock_uint64()
436		-{
437		- if(vm == NULL) return (uint64_t)0;
438		- return vm->get_current_clock_uint64();
439		-}
440		-
441	429
442	430	void OSD_BASE::add_feature(const _TCHAR *key, double value)
443	431	{

--- a/source/src/qt/osd_base.h

+++ b/source/src/qt/osd_base.h

		@@ -637,8 +637,8 @@ public:
637	637	void debug_log(int level, const char *fmt, ...);
638	638	void debug_log(int level, int domain_num, const char *fmt, ...);
639	639	void debug_log(int level, int domain_num, char *strbuf);
640		- double get_vm_current_usec();
641		- uint64_t get_vm_current_clock_uint64();
	640	+ virtual double get_vm_current_usec() { return 0.0; }
	641	+ virtual uint64_t get_vm_current_clock_uint64() { return 0;}
642	642
643	643
644	644	USING_FLAGS *get_config_flags(void) { return using_flags; }

--- a/source/src/qt/osd_wrapper.cpp

+++ b/source/src/qt/osd_wrapper.cpp

		@@ -849,3 +849,15 @@ int OSD::add_video_frames()
849	849	return counter;
850	850	}
851	851
	852	+double OSD::get_vm_current_usec()
	853	+{
	854	+ if(vm == NULL) return 0.0;
	855	+ return vm->get_current_usec();
	856	+}
	857	+
	858	+uint64_t OSD::get_vm_current_clock_uint64()
	859	+{
	860	+ if(vm == NULL) return (uint64_t)0;
	861	+ return vm->get_current_clock_uint64();
	862	+}
	863	+