On Thu, Mar 15, 2012 at 02:13:35AM +0100, Marc-André Lureau wrote: Arnon, could you test this? it touched the vcproj file, I don't have a build environment atm. Thanks.
> --- > client/Makefile.am | 6 +-- > client/demarshallers.h | 27 ------------------ > client/marshallers.h | 63 > ------------------------------------------ > client/red_channel.h | 4 +- > client/red_client.cpp | 2 +- > client/windows/generate.bat | 2 +- > client/windows/generate1.bat | 2 +- > client/windows/redc.vcproj | 2 +- > 8 files changed, 8 insertions(+), 100 deletions(-) > delete mode 100644 client/demarshallers.h > delete mode 100644 client/marshallers.h > > diff --git a/client/Makefile.am b/client/Makefile.am > index c4b5fe1..760adf2 100644 > --- a/client/Makefile.am > +++ b/client/Makefile.am > @@ -16,10 +16,10 @@ generated_demarshallers1.cpp: $(top_srcdir)/spice1.proto > $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > --generate-demarshallers --client --include common.h --include messages.h > --prefix 1 --ptrsize 8 $(top_srcdir)/spice1.proto generated_demarshallers1.cpp > > generated_marshallers.cpp: $(top_srcdir)/spice.proto > - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > --generate-marshallers -P --include "common.h" --include messages.h > --include marshallers.h --client $(top_srcdir)/spice.proto > generated_marshallers.cpp > + $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > --generate-marshallers -P --include common.h --include messages.h --include > client_marshallers.h --client $(top_srcdir)/spice.proto > generated_marshallers.cpp > > generated_marshallers1.cpp: $(top_srcdir)/spice1.proto > - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > --generate-marshallers -P --include "common.h" --include messages.h > --include marshallers.h --client --prefix 1 --ptrsize 8 > $(top_srcdir)/spice1.proto generated_marshallers1.cpp > + $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > --generate-marshallers -P --include common.h --include messages.h --include > client_marshallers.h --client --prefix 1 --ptrsize 8 > $(top_srcdir)/spice1.proto generated_marshallers1.cpp > > MAINTAINERCLEANFILES = $(BUILT_SOURCES) > > @@ -43,7 +43,6 @@ spicec_SOURCES = \ > cursor_channel.cpp \ > cursor_channel.h \ > debug.h \ > - demarshallers.h \ > display_channel.cpp \ > display_channel.h \ > event_sources.h \ > @@ -63,7 +62,6 @@ spicec_SOURCES = \ > inputs_handler.h \ > jpeg_decoder.cpp \ > jpeg_decoder.h \ > - marshallers.h \ > menu.cpp \ > menu.h \ > mjpeg_decoder.cpp \ > diff --git a/client/demarshallers.h b/client/demarshallers.h > deleted file mode 100644 > index 90084cf..0000000 > --- a/client/demarshallers.h > +++ /dev/null > @@ -1,27 +0,0 @@ > -/* > - Copyright (C) 2010 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, see > <http://www.gnu.org/licenses/>. > -*/ > -#ifndef _H_DEMARSHAL > -#define _H_DEMARSHAL > - > -typedef void (*message_destructor_t)(uint8_t *message); > -typedef uint8_t * (*spice_parse_channel_func_t)(uint8_t *message_start, > uint8_t *message_end, uint16_t message_type, int minor, > - size_t *size_out, > message_destructor_t *free_message); > - > -spice_parse_channel_func_t spice_get_server_channel_parser(uint32_t channel, > unsigned int *max_message_type); > -spice_parse_channel_func_t spice_get_server_channel_parser1(uint32_t > channel, unsigned int *max_message_type); > - > -#endif > diff --git a/client/marshallers.h b/client/marshallers.h > deleted file mode 100644 > index 47faeff..0000000 > --- a/client/marshallers.h > +++ /dev/null > @@ -1,63 +0,0 @@ > -/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */ > -/* > - Copyright (C) 2010 Red Hat, Inc. > - > - This library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with this library; if not, see > <http://www.gnu.org/licenses/>. > -*/ > - > -#ifndef _H_MARSHALLERS > -#define _H_MARSHALLERS > - > -#include <spice/protocol.h> > -#include <marshaller.h> > -#include <messages.h> > - > -typedef struct { > - void (*msg_SpiceMsgEmpty)(SpiceMarshaller *m, SpiceMsgEmpty *msg); > - void (*msg_SpiceMsgData)(SpiceMarshaller *m, SpiceMsgData *msg); > - void (*msg_SpiceMsgAudioVolume)(SpiceMarshaller *m, SpiceMsgAudioVolume > *msg); > - void (*msg_SpiceMsgAudioMute)(SpiceMarshaller *m, SpiceMsgAudioMute > *msg); > - void (*msgc_ack_sync)(SpiceMarshaller *m, SpiceMsgcAckSync *msg); > - void (*msgc_pong)(SpiceMarshaller *m, SpiceMsgPing *msg); > - void (*msgc_disconnecting)(SpiceMarshaller *m, SpiceMsgDisconnect *msg); > - void (*msgc_main_client_info)(SpiceMarshaller *m, SpiceMsgcClientInfo > *msg); > - void (*msgc_main_mouse_mode_request)(SpiceMarshaller *m, > SpiceMsgcMainMouseModeRequest *msg); > - void (*msgc_main_agent_start)(SpiceMarshaller *m, > SpiceMsgcMainAgentStart *msg); > - void (*msgc_main_agent_token)(SpiceMarshaller *m, > SpiceMsgcMainAgentTokens *msg); > - void (*msgc_display_init)(SpiceMarshaller *m, SpiceMsgcDisplayInit *msg); > - void (*msgc_inputs_key_down)(SpiceMarshaller *m, SpiceMsgcKeyDown *msg); > - void (*msgc_inputs_key_up)(SpiceMarshaller *m, SpiceMsgcKeyUp *msg); > - void (*msgc_inputs_key_modifiers)(SpiceMarshaller *m, > SpiceMsgcKeyModifiers *msg); > - void (*msgc_inputs_mouse_motion)(SpiceMarshaller *m, > SpiceMsgcMouseMotion *msg); > - void (*msgc_inputs_mouse_position)(SpiceMarshaller *m, > SpiceMsgcMousePosition *msg); > - void (*msgc_inputs_mouse_press)(SpiceMarshaller *m, SpiceMsgcMousePress > *msg); > - void (*msgc_inputs_mouse_release)(SpiceMarshaller *m, > SpiceMsgcMouseRelease *msg); > - void (*msgc_record_data)(SpiceMarshaller *m, SpiceMsgcRecordPacket *msg); > - void (*msgc_record_mode)(SpiceMarshaller *m, SpiceMsgcRecordMode *msg); > - void (*msgc_record_start_mark)(SpiceMarshaller *m, > SpiceMsgcRecordStartMark *msg); > - void (*msgc_tunnel_service_add)(SpiceMarshaller *m, > SpiceMsgcTunnelAddGenericService *msg, SpiceMarshaller **name_out, > SpiceMarshaller **description_out); > - void (*msgc_tunnel_service_remove)(SpiceMarshaller *m, > SpiceMsgcTunnelRemoveService *msg); > - void (*msgc_tunnel_socket_open_ack)(SpiceMarshaller *m, > SpiceMsgcTunnelSocketOpenAck *msg); > - void (*msgc_tunnel_socket_open_nack)(SpiceMarshaller *m, > SpiceMsgcTunnelSocketOpenNack *msg); > - void (*msgc_tunnel_socket_fin)(SpiceMarshaller *m, > SpiceMsgcTunnelSocketFin *msg); > - void (*msgc_tunnel_socket_closed)(SpiceMarshaller *m, > SpiceMsgcTunnelSocketClosed *msg); > - void (*msgc_tunnel_socket_closed_ack)(SpiceMarshaller *m, > SpiceMsgcTunnelSocketClosedAck *msg); > - void (*msgc_tunnel_socket_data)(SpiceMarshaller *m, > SpiceMsgcTunnelSocketData *msg); > - void (*msgc_tunnel_socket_token)(SpiceMarshaller *m, > SpiceMsgcTunnelSocketTokens *msg); > -} SpiceMessageMarshallers; > - > -SpiceMessageMarshallers *spice_message_marshallers_get(void); > -SpiceMessageMarshallers *spice_message_marshallers_get1(void); > - > -#endif > diff --git a/client/red_channel.h b/client/red_channel.h > index a839021..989e52a 100644 > --- a/client/red_channel.h > +++ b/client/red_channel.h > @@ -24,8 +24,8 @@ > #include "red_peer.h" > #include "platform.h" > #include "process_loop.h" > -#include "demarshallers.h" > -#include "marshallers.h" > +#include "client_demarshallers.h" > +#include "client_marshallers.h" > > enum { > PASSIVE_STATE, > diff --git a/client/red_client.cpp b/client/red_client.cpp > index 0454408..4386106 100644 > --- a/client/red_client.cpp > +++ b/client/red_client.cpp > @@ -25,7 +25,7 @@ > #include "process_loop.h" > #include "utils.h" > #include "debug.h" > -#include "marshallers.h" > +#include "client_marshallers.h" > #include <algorithm> > > #ifndef INFINITY > diff --git a/client/windows/generate.bat b/client/windows/generate.bat > index 6bd06d7..b909351 100644 > --- a/client/windows/generate.bat > +++ b/client/windows/generate.bat > @@ -1,2 +1,2 @@ > python ..\..\spice_codegen.py -d -c -i common.h -i messages.h > ..\..\spice.proto ..\generated_demarshallers.cpp > -python ..\..\spice_codegen.py --generate-marshallers -P --include "common.h" > --include messages.h --include marshallers.h --client ..\..\spice.proto > ..\generated_marshallers.cpp > +python ..\..\spice_codegen.py --generate-marshallers -P --include "common.h" > --include messages.h --include client_marshallers.h --client > ..\..\spice.proto ..\generated_marshallers.cpp > diff --git a/client/windows/generate1.bat b/client/windows/generate1.bat > index 559c670..77080e0 100644 > --- a/client/windows/generate1.bat > +++ b/client/windows/generate1.bat > @@ -1,2 +1,2 @@ > python ..\..\spice_codegen.py -d -c -i common.h -i messages.h --prefix 1 > --ptrsize 8 ..\..\spice1.proto ..\generated_demarshallers1.cpp > -python ..\..\spice_codegen.py --generate-marshallers -P --include "common.h" > --include messages.h --include marshallers.h --client --prefix 1 --ptrsize 8 > ..\..\spice1.proto ..\generated_marshallers1.cpp > +python ..\..\spice_codegen.py --generate-marshallers -P --include "common.h" > --include messages.h --include client_marshallers.h --client --prefix 1 > --ptrsize 8 ..\..\spice1.proto ..\generated_marshallers1.cpp > diff --git a/client/windows/redc.vcproj b/client/windows/redc.vcproj > index f27c7ce..18b74d8 100644 > --- a/client/windows/redc.vcproj > +++ b/client/windows/redc.vcproj > @@ -695,7 +695,7 @@ > > > </File> > <File > - RelativePath="..\demarshallers.h" > + RelativePath="..\client_demarshallers.h" > > > </File> > <File > -- > 1.7.7.6 > > _______________________________________________ > Spice-devel mailing list > Spice-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/spice-devel _______________________________________________ Spice-devel mailing list Spice-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/spice-devel
