Merge branch 'app_server'

Conflicts:
	src/kits/interface/PicturePlayer.cpp
	src/servers/app/ServerPicture.cpp

In addition, the following files were also adapted to master branch
BPicture changes during the merge:
	src/kits/interface/PicturePlayer.h
	src/servers/app/PictureBoundingBoxPlayer.cpp
This commit is contained in:
Julian Harnath
2015-11-10 23:09:54 +01:00
71 changed files with 5461 additions and 2390 deletions
+8 -1
View File
@@ -23,7 +23,14 @@ namespace BPrivate {
extern const char* kRAppLooperPortName;
#define B_REGISTRAR_SIGNATURE "application/x-vnd.haiku-registrar"
#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
# define B_REGISTRAR_SIGNATURE "application/x-vnd.haiku-registrar"
# define B_REGISTRAR_PORT_NAME "system:roster"
#else
# define B_REGISTRAR_SIGNATURE "application/x-vnd.test-registrar"
# define B_REGISTRAR_PORT_NAME "haiku-test:roster"
#endif
#define B_REGISTRAR_AUTHENTICATION_PORT_NAME "auth"
+7
View File
@@ -7,6 +7,7 @@
* Jérôme Duval, [email protected]
* Axel Dörfler, [email protected]
* Andrej Spielmann, <[email protected]>
* Julian Harnath, <[email protected]>
*/
#ifndef APP_SERVER_PROTOCOL_H
#define APP_SERVER_PROTOCOL_H
@@ -15,6 +16,10 @@
#include <SupportDefs.h>
#ifdef HAIKU_TARGET_PLATFORM_LIBBE_TEST
# define SERVER_PORT_NAME "haiku-test:app_server"
#endif
#if TEST_MODE
# define SERVER_INPUT_PORT "haiku-test:input port"
#endif
@@ -319,6 +324,8 @@ enum {
AS_VIEW_SET_VIEW_BITMAP,
AS_VIEW_SET_PATTERN,
AS_SET_CURRENT_VIEW,
AS_VIEW_BEGIN_LAYER,
AS_VIEW_END_LAYER,
// BDirectWindow/BWindowScreen codes
AS_DIRECT_WINDOW_GET_SYNC_DATA,