mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-24 22:30:42 -04:00
* fixed, transfer start when subscribing to channel.
* cleaned up p3distrib callbacks. * added holdQueue for transfer startup in controller. * fixed partial resume. * updated Mac script to only build library. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@828 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
71797d6f70
commit
c46b823261
12 changed files with 222 additions and 141 deletions
|
@ -194,6 +194,14 @@ class GroupCache
|
|||
uint16_t cacheSubId;
|
||||
};
|
||||
|
||||
/* Flags for locked_notifyGroupChanged() ***/
|
||||
|
||||
const uint32_t GRP_NEW_UPDATE = 0x0001;
|
||||
const uint32_t GRP_UPDATE = 0x0002;
|
||||
const uint32_t GRP_LOAD_KEY = 0x0003;
|
||||
const uint32_t GRP_NEW_MSG = 0x0004;
|
||||
const uint32_t GRP_SUBSCRIBED = 0x0005;
|
||||
const uint32_t GRP_UNSUBSCRIBED = 0x0006;
|
||||
|
||||
class p3GroupDistrib: public CacheSource, public CacheStore, public p3Config, public nullService
|
||||
{
|
||||
|
@ -279,7 +287,9 @@ RsDistribMsg *locked_getGroupMsg(std::string grpId, std::string msgId);
|
|||
/***************************** Event Feedback ******************************************/
|
||||
/***************************************************************************************/
|
||||
|
||||
virtual bool locked_eventUpdateGroup(GroupInfo *, bool isNew) = 0;
|
||||
protected:
|
||||
/* root version of this function must be called */
|
||||
virtual void locked_notifyGroupChanged(GroupInfo &info, uint32_t flags);
|
||||
virtual bool locked_eventDuplicateMsg(GroupInfo *, RsDistribMsg *, std::string id) = 0;
|
||||
virtual bool locked_eventNewMsg(GroupInfo *, RsDistribMsg *, std::string id) = 0;
|
||||
|
||||
|
@ -347,9 +357,6 @@ virtual bool locked_choosePublishKey(GroupInfo &info);
|
|||
//virtual RsDistribGrp *locked_createPublicDistribGrp(GroupInfo &info);
|
||||
//virtual RsDistribGrp *locked_createPrivateDistribGrp(GroupInfo &info);
|
||||
|
||||
protected:
|
||||
/* root version of this function must be called */
|
||||
virtual void locked_notifyGroupChanged(GroupInfo &info);
|
||||
|
||||
/***************************************************************************************/
|
||||
/***************************** Utility Functions ***************************************/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue