Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
64755516
Commit
64755516
authored
7 years ago
by
Olivier SOLDANO
Committed by
Adrien Béraud
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
feat: update swig binding for new data transfer api
Change-Id: Ie22397833ab863f845a9623570c0c0c3c15a1b09
parent
19dbc124
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bin/jni/datatransfer.i
+16
-16
16 additions, 16 deletions
bin/jni/datatransfer.i
with
16 additions
and
16 deletions
bin/jni/datatransfer.i
+
16
−
16
View file @
64755516
...
...
@@ -20,7 +20,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
%
apply
int32_t
{ DRing::DataTransferEventCode }
;
%
apply
uint32_t
{ DRing::DataTransferEventCode }
;
%
apply
uint32_t
{ DRing::DataTransferError }
;
%
apply
uint64_t
{ DRing::DataTransferId }
;
%
apply
uint64_t
{ const DRing::DataTransferId }
;
...
...
@@ -28,7 +29,6 @@
#
include
"
dring/dring.h
"
#
include
"
dring/datatransfer_interface.h
"
class
DataTransferCallback
{
public
:
virtual
~
DataTransferCallback
()
{}
...
...
@@ -42,22 +42,22 @@ namespace DRing {
struct DataTransferInfo
{
bool isOutgoing;
DRing::DataTransferEventCode lastEvent;
std::size_t totalSize {0};
std::streamsize bytesProgress {0};
std::string displayName;
std::string path;
std::string accountId;
std::string peer;
std::string accountId;
DRing::DataTransferEventCode lastEvent;
uint32_t flags;
int64_t totalSize;
int64_t bytesProgress;
std::string peer;
std::string displayName;
std::string path;
std::string mimetype;
};
void acceptFileTransfer(const DRing::DataTransferId id, const std::string &file_path, std::size_t offset);
void cancelDataTransfer(const DRing::DataTransferId id);
std::streamsize dataTransferBytesProgress(const DRing::DataTransferId id);
DRing::DataTransferInfo dataTransferInfo(const DRing::DataTransferId id) throw(std::invalid_argument);
/* std::vector<uint64_t> dataTransferList(); */
DRing::DataTransferId sendFile(const std::string &account_id, const std::string &peer_uri, const std::string &file_path, const std::string &display_name) throw(std::invalid_argument, std::runtime_error);
DRing::DataTransferError sendFile(const DRing::DataTransferInfo info, DRing::DataTransferId id);
DRing::DataTransferError acceptFileTransfer(const DRing::DataTransferId id, const std::string file_path, int64_t offset);
DRing::DataTransferError cancelDataTransfer(const DRing::DataTransferId id);
DRing::DataTransferError dataTransferInfo(const DRing::DataTransferId id, DRing::DataTransferInfo &info);
DRing::DataTransferError dataTransferBytesProgress(const DRing::DataTransferId id, int64_t &total, int64_t &progress);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment