Merge pull request #10 from huffman/feat/entity-server-script-property

Entity script status + reload

Clément Brisset committed 9 years ago

Commit 89d12422 parents 2117b1f 3b5b88e15 files · +290 −33Browse files

Showing the changes to assignment-client/src/scripts/EntityScriptServer.h (1 of 15 files). Show all

Unified · Split

@@ -39,6 +39,9 @@ private slots: · 38 unmodified lines
39	void handleJurisdictionPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);	39	void handleJurisdictionPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
40	void handleSelectedAudioFormat(QSharedPointer<ReceivedMessage> message);	40	void handleSelectedAudioFormat(QSharedPointer<ReceivedMessage> message);
41		41
		42	void handleReloadEntityServerScriptPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
		43	void handleEntityScriptGetStatusPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
		44
42	private:	45	private:
43	void negotiateAudioFormat();	46	void negotiateAudioFormat();
44	void selectAudioFormat(const QString& selectedCodecName);	47	void selectAudioFormat(const QString& selectedCodecName);