Skip to content

Commit c7ae4a5

Browse files
iphydfiphydf
committed
Migrate to Camel_Case enum types.
UPPER_CASE enum types are deprecated and will be removed in 0.3.0.
1 parent 6966588 commit c7ae4a5

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

‎pytox/av.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ static int init_helper(ToxAVCore *self, PyObject* args)
297297
self->core = core;
298298
Py_INCREF(self->core);
299299

300-
TOXAV_ERR_NEW err = 0;
300+
Toxav_Err_New err = 0;
301301
self->av = toxav_new(((ToxCore*)self->core)->tox, &err);
302302

303303
if (self->av == NULL) {
@@ -368,7 +368,7 @@ ToxAVCore_call(ToxAVCore *self, PyObject* args)
368368
return NULL;
369369
}
370370

371-
TOXAV_ERR_CALL err = 0;
371+
Toxav_Err_Call err = 0;
372372
bool ret = toxav_call(self->av, friend_number, audio_bit_rate, video_bit_rate, &err);
373373
if (ret == false) {
374374
PyErr_Format(ToxOpError, "toxav call error: %d", err);
@@ -387,7 +387,7 @@ ToxAVCore_call_control(ToxAVCore *self, PyObject* args)
387387
return NULL;
388388
}
389389

390-
TOXAV_ERR_CALL_CONTROL err = 0;
390+
Toxav_Err_Call_Control err = 0;
391391
bool ret = toxav_call_control(self->av, friend_number, control, &err);
392392
if (ret == false) {
393393
PyErr_Format(ToxOpError, "toxav call control error: %d", err);
@@ -406,7 +406,7 @@ ToxAVCore_audio_set_bit_rate(ToxAVCore *self, PyObject* args)
406406
return NULL;
407407
}
408408

409-
TOXAV_ERR_BIT_RATE_SET err = 0;
409+
Toxav_Err_Bit_Rate_Set err = 0;
410410
bool ret = toxav_audio_set_bit_rate(self->av, friend_number, audio_bit_rate, &err);
411411
if (ret == false) {
412412
PyErr_Format(ToxOpError, "toxav bit rate set error: %d", err);
@@ -425,7 +425,7 @@ ToxAVCore_video_set_bit_rate(ToxAVCore *self, PyObject* args)
425425
return NULL;
426426
}
427427

428-
TOXAV_ERR_BIT_RATE_SET err = 0;
428+
Toxav_Err_Bit_Rate_Set err = 0;
429429
bool ret = toxav_video_set_bit_rate(self->av, friend_number, video_bit_rate, &err);
430430
if (ret == false) {
431431
PyErr_Format(ToxOpError, "toxav bit rate set error: %d", err);
@@ -449,7 +449,7 @@ ToxAVCore_audio_send_frame(ToxAVCore *self, PyObject* args)
449449
return NULL;
450450
}
451451

452-
TOXAV_ERR_SEND_FRAME err = 0;
452+
Toxav_Err_Send_Frame err = 0;
453453
bool ret = toxav_audio_send_frame(self->av, friend_number, pcm,
454454
sample_count, channels, sampling_rate, &err);
455455
if (ret == false) {
@@ -483,7 +483,7 @@ ToxAVCore_video_send_frame(ToxAVCore *self, PyObject* args)
483483

484484
rgb_to_i420((unsigned char*)data, self->in_image);
485485

486-
TOXAV_ERR_SEND_FRAME err = 0;
486+
Toxav_Err_Send_Frame err = 0;
487487
bool ret = toxav_video_send_frame(self->av, friend_number, width, height,
488488
self->in_image->planes[0],
489489
self->in_image->planes[1],
@@ -508,7 +508,7 @@ ToxAVCore_answer(ToxAVCore *self, PyObject* args)
508508
return NULL;
509509
}
510510

511-
TOXAV_ERR_ANSWER err = 0;
511+
Toxav_Err_Answer err = 0;
512512
bool ret = toxav_answer(self->av, friend_number, audio_bit_rate, video_bit_rate, &err);
513513
if (ret == false) {
514514
PyErr_Format(ToxOpError, "toxav answer error: %d", err);

‎pytox/core.c‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
# define BUF_TC "y"
3131
#endif
3232

33-
static void callback_log(Tox *tox, TOX_LOG_LEVEL level, const char *file, uint32_t line, const char *func,
33+
static void callback_log(Tox *tox, Tox_Log_Level level, const char *file, uint32_t line, const char *func,
3434
const char *message, void* self)
3535
{
3636
PyObject_CallMethod((PyObject*)self, "on_log", "isiss", level, file, line,
3737
func, message);
3838
}
3939

40-
static void callback_self_connection_status(Tox* tox, TOX_CONNECTION connection_status,
40+
static void callback_self_connection_status(Tox* tox, Tox_Connection connection_status,
4141
void *self)
4242
{
4343
PyObject_CallMethod((PyObject*)self, "on_self_connection_status", "i",
@@ -56,7 +56,7 @@ static void callback_friend_request(Tox* tox, const uint8_t* public_key,
5656
length - (data[length - 1] == 0));
5757
}
5858

59-
static void callback_friend_message(Tox *tox, uint32_t friendnumber, TOX_MESSAGE_TYPE type,
59+
static void callback_friend_message(Tox *tox, uint32_t friendnumber, Tox_Message_Type type,
6060
const uint8_t* message, size_t length, void* self)
6161
{
6262
PyObject_CallMethod((PyObject*)self, "on_friend_message", "iis#", friendnumber, type,
@@ -77,7 +77,7 @@ static void callback_friend_status_message(Tox *tox, uint32_t friendnumber,
7777
newstatus, length - (newstatus[length - 1] == 0));
7878
}
7979

80-
static void callback_friend_status(Tox *tox, uint32_t friendnumber, TOX_USER_STATUS status,
80+
static void callback_friend_status(Tox *tox, uint32_t friendnumber, Tox_User_Status status,
8181
void* self)
8282
{
8383
PyObject_CallMethod((PyObject*)self, "on_friend_status", "ii", friendnumber,
@@ -99,21 +99,21 @@ static void callback_friend_read_receipt(Tox *tox, uint32_t friendnumber,
9999
}
100100

101101
static void callback_friend_connection_status(Tox *tox, uint32_t friendnumber,
102-
TOX_CONNECTION status, void* self)
102+
Tox_Connection status, void* self)
103103
{
104104
PyObject_CallMethod((PyObject*)self, "on_friend_connection_status", "iO",
105105
friendnumber, PyBool_FromLong(status));
106106
}
107107

108-
static void callback_conference_invite(Tox *tox, uint32_t friendnumber, TOX_CONFERENCE_TYPE type,
108+
static void callback_conference_invite(Tox *tox, uint32_t friendnumber, Tox_Conference_Type type,
109109
const uint8_t *data, size_t length, void *self)
110110
{
111111
PyObject_CallMethod((PyObject*)self, "on_conference_invite", "ii" BUF_TC "#",
112112
friendnumber, type, data, length);
113113
}
114114

115115
static void callback_conference_message(Tox *tox, uint32_t conference_number,
116-
uint32_t peer_number, TOX_MESSAGE_TYPE type, const uint8_t* message, size_t length, void *self)
116+
uint32_t peer_number, Tox_Message_Type type, const uint8_t* message, size_t length, void *self)
117117
{
118118
PyObject_CallMethod((PyObject*)self, "on_conference_message", "iiis#", conference_number,
119119
peer_number, type, message, length - (message[length - 1] == 0));
@@ -159,7 +159,7 @@ static void callback_file_recv(Tox *tox, uint32_t friend_number, uint32_t file_n
159159
}
160160

161161
static void callback_file_recv_control(Tox *tox, uint32_t friend_number, uint32_t file_number,
162-
TOX_FILE_CONTROL control, void *self)
162+
Tox_File_Control control, void *self)
163163
{
164164
PyObject_CallMethod((PyObject*)self, "on_file_recv_control", "iii",
165165
friend_number, file_number, control);
@@ -266,7 +266,7 @@ static int init_helper(ToxCore* self, PyObject* args)
266266
init_options(self, opts, options, &savedata_data, &proxy_host);
267267
}
268268

269-
TOX_ERR_NEW err = 0;
269+
Tox_Err_New err = 0;
270270
Tox* tox = tox_new(options, &err);
271271
free(savedata_data);
272272
free(proxy_host);
@@ -363,7 +363,7 @@ ToxCore_friend_add(ToxCore* self, PyObject* args)
363363
uint8_t pk[TOX_ADDRESS_SIZE];
364364
hex_string_to_bytes(address, TOX_ADDRESS_SIZE, pk);
365365

366-
TOX_ERR_FRIEND_ADD err = 0;
366+
Tox_Err_Friend_Add err = 0;
367367
uint32_t friend_number = 0;
368368
friend_number = tox_friend_add(self->tox, pk, data, data_length, &err);
369369
int success = friend_number == UINT32_MAX ? 0 : 1;
@@ -424,7 +424,7 @@ ToxCore_friend_add_norequest(ToxCore* self, PyObject* args)
424424
uint8_t pk[TOX_ADDRESS_SIZE];
425425
hex_string_to_bytes(address, TOX_ADDRESS_SIZE, pk);
426426

427-
TOX_ERR_FRIEND_ADD err = 0;
427+
Tox_Err_Friend_Add err = 0;
428428
int res = tox_friend_add_norequest(self->tox, pk, &err);
429429
if (res == -1) {
430430
PyErr_Format(ToxOpError, "failed to add friend: %d", err);
@@ -550,8 +550,8 @@ ToxCore_friend_send_message(ToxCore* self, PyObject* args)
550550
return NULL;
551551
}
552552

553-
TOX_MESSAGE_TYPE type = msg_type;
554-
TOX_ERR_FRIEND_SEND_MESSAGE errmsg = 0;
553+
Tox_Message_Type type = msg_type;
554+
Tox_Err_Friend_Send_Message errmsg = 0;
555555
uint32_t ret = tox_friend_send_message(self->tox, friend_num, type, message, length, &errmsg);
556556
if (ret == 0) {
557557
PyErr_SetString(ToxOpError, "failed to send message");
@@ -881,7 +881,7 @@ ToxCore_conference_new(ToxCore* self, PyObject* args)
881881
{
882882
CHECK_TOX(self);
883883

884-
TOX_ERR_CONFERENCE_NEW error;
884+
Tox_Err_Conference_New error;
885885
uint32_t conference_number = tox_conference_new(self->tox, &error);
886886
if (error != TOX_ERR_CONFERENCE_NEW_OK) {
887887
PyErr_SetString(ToxOpError, "failed to create conference");
@@ -901,7 +901,7 @@ ToxCore_conference_delete(ToxCore* self, PyObject* args)
901901
return NULL;
902902
}
903903

904-
TOX_ERR_CONFERENCE_DELETE error;
904+
Tox_Err_Conference_Delete error;
905905
tox_conference_delete(self->tox, conference_number, &error);
906906
if (error != TOX_ERR_CONFERENCE_DELETE_OK) {
907907
PyErr_SetString(ToxOpError, "failed to delete conference");
@@ -947,7 +947,7 @@ ToxCore_conference_get_title(ToxCore* self, PyObject* args)
947947
uint8_t buf[TOX_MAX_NAME_LENGTH];
948948
memset(buf, 0, TOX_MAX_NAME_LENGTH);
949949

950-
TOX_ERR_CONFERENCE_TITLE error;
950+
Tox_Err_Conference_Title error;
951951
tox_conference_get_title(self->tox, conference_number, buf, &error);
952952
if (error != TOX_ERR_CONFERENCE_TITLE_OK) {
953953
return PYSTRING_FromString(""); /* no title. */
@@ -969,7 +969,7 @@ ToxCore_conference_set_title(ToxCore* self, PyObject* args)
969969
return NULL;
970970
}
971971

972-
TOX_ERR_CONFERENCE_TITLE error;
972+
Tox_Err_Conference_Title error;
973973
tox_conference_set_title(self->tox, conference_number, title, length, &error);
974974
if (error != TOX_ERR_CONFERENCE_TITLE_OK) {
975975
PyErr_SetString(ToxOpError, "failed to set the conference title");
@@ -988,8 +988,8 @@ ToxCore_conference_get_type(ToxCore* self, PyObject* args)
988988
return NULL;
989989
}
990990

991-
TOX_ERR_CONFERENCE_GET_TYPE error;
992-
TOX_CONFERENCE_TYPE type = tox_conference_get_type(self->tox, conference_number, &error);
991+
Tox_Err_Conference_Get_Type error;
992+
Tox_Conference_Type type = tox_conference_get_type(self->tox, conference_number, &error);
993993
if (error != TOX_ERR_CONFERENCE_GET_TYPE_OK) {
994994
PyErr_SetString(ToxOpError, "failed to get conference type");
995995
}
@@ -1011,7 +1011,7 @@ ToxCore_conference_peer_get_name(ToxCore* self, PyObject* args)
10111011
return NULL;
10121012
}
10131013

1014-
TOX_ERR_CONFERENCE_PEER_QUERY error;
1014+
Tox_Err_Conference_Peer_Query error;
10151015
tox_conference_peer_get_name(self->tox, conference_number,
10161016
peer_number, buf, &error);
10171017
if (error != TOX_ERR_CONFERENCE_PEER_QUERY_OK) {
@@ -1032,7 +1032,7 @@ ToxCore_conference_invite(ToxCore* self, PyObject* args)
10321032
return NULL;
10331033
}
10341034

1035-
TOX_ERR_CONFERENCE_INVITE error;
1035+
Tox_Err_Conference_Invite error;
10361036
tox_conference_invite(self->tox, friend_number, conference_number, &error);
10371037
if (error != TOX_ERR_CONFERENCE_INVITE_OK) {
10381038
PyErr_SetString(ToxOpError, "failed to invite friend");
@@ -1054,7 +1054,7 @@ ToxCore_conference_join(ToxCore* self, PyObject* args)
10541054
return NULL;
10551055
}
10561056

1057-
TOX_ERR_CONFERENCE_JOIN error;
1057+
Tox_Err_Conference_Join error;
10581058
uint32_t ret = tox_conference_join(self->tox, friend_number, cookie, length,
10591059
&error);
10601060
if (error != TOX_ERR_CONFERENCE_JOIN_OK) {
@@ -1078,7 +1078,7 @@ ToxCore_conference_send_message(ToxCore* self, PyObject* args)
10781078
return NULL;
10791079
}
10801080

1081-
TOX_ERR_CONFERENCE_SEND_MESSAGE error;
1081+
Tox_Err_Conference_Send_Message error;
10821082
tox_conference_send_message(self->tox, conference_number, type, message, length, &error);
10831083
if (error != TOX_ERR_CONFERENCE_SEND_MESSAGE_OK) {
10841084
PyErr_SetString(ToxOpError, "failed to send conference message");
@@ -1099,7 +1099,7 @@ ToxCore_conference_peer_number_is_ours(ToxCore* self, PyObject* args)
10991099
return NULL;
11001100
}
11011101

1102-
TOX_ERR_CONFERENCE_PEER_QUERY error;
1102+
Tox_Err_Conference_Peer_Query error;
11031103
bool ret = tox_conference_peer_number_is_ours(self->tox, conference_number, peer_number, &error);
11041104
if (error != TOX_ERR_CONFERENCE_PEER_QUERY_OK) {
11051105
PyErr_SetString(ToxOpError, "failed to check if peer number is ours");
@@ -1119,7 +1119,7 @@ ToxCore_conference_peer_count(ToxCore* self, PyObject* args)
11191119
return NULL;
11201120
}
11211121

1122-
TOX_ERR_CONFERENCE_PEER_QUERY error;
1122+
Tox_Err_Conference_Peer_Query error;
11231123
uint32_t count = tox_conference_peer_count(self->tox, conference_number, &error);
11241124
if (error != TOX_ERR_CONFERENCE_PEER_QUERY_OK) {
11251125
PyErr_SetString(ToxOpError, "failed to get conference peer count");
@@ -1181,7 +1181,7 @@ ToxCore_file_send(ToxCore* self, PyObject*args)
11811181
return NULL;
11821182
}
11831183

1184-
TOX_ERR_FILE_SEND err = 0;
1184+
Tox_Err_File_Send err = 0;
11851185
uint32_t file_number =
11861186
tox_file_send(self->tox, friend_number, kind, file_size, file_id, filename, filename_length, &err);
11871187
if (file_number == UINT32_MAX) {
@@ -1228,7 +1228,7 @@ ToxCore_file_send_chunk(ToxCore* self, PyObject* args)
12281228
return NULL;
12291229
}
12301230

1231-
TOX_ERR_FILE_SEND_CHUNK err = 0;
1231+
Tox_Err_File_Send_Chunk err = 0;
12321232
bool ret = tox_file_send_chunk(self->tox, friend_number, file_number, position,
12331233
data, length, &err);
12341234
if (!ret) {
@@ -1251,7 +1251,7 @@ ToxCore_file_seek(ToxCore* self, PyObject* args)
12511251
return NULL;
12521252
}
12531253

1254-
TOX_ERR_FILE_SEEK err = 0;
1254+
Tox_Err_File_Seek err = 0;
12551255
bool ret = tox_file_seek(self->tox, friend_number, file_number, position, &err);
12561256

12571257
if (!ret) {
@@ -1279,7 +1279,7 @@ ToxCore_file_get_file_id(ToxCore* self, PyObject* args)
12791279
uint8_t hex[TOX_FILE_ID_LENGTH * 2 + 1];
12801280
memset(hex, 0, TOX_FILE_ID_LENGTH * 2 + 1);
12811281

1282-
TOX_ERR_FILE_GET err = 0;
1282+
Tox_Err_File_Get err = 0;
12831283
bool ret = tox_file_get_file_id(self->tox, friend_number, file_number, file_id, &err);
12841284
if (!ret) {
12851285
PyErr_Format(ToxOpError, "tox_file_get_file_id() failed: %d", err);
@@ -1310,7 +1310,7 @@ ToxCore_self_get_udp_port(ToxCore* self, PyObject* args)
13101310
{
13111311
CHECK_TOX(self);
13121312

1313-
TOX_ERR_GET_PORT err;
1313+
Tox_Err_Get_Port err;
13141314
uint16_t nospam = tox_self_get_udp_port(self->tox, &err);
13151315
if (err != TOX_ERR_GET_PORT_OK) {
13161316
PyErr_Format(ToxOpError, "tox_self_get_udp_port() failed: %d", err);
@@ -1428,7 +1428,7 @@ ToxCore_self_get_connection_status(ToxCore* self, PyObject* args)
14281428
{
14291429
CHECK_TOX(self);
14301430

1431-
TOX_CONNECTION conn = tox_self_get_connection_status(self->tox);
1431+
Tox_Connection conn = tox_self_get_connection_status(self->tox);
14321432

14331433
return PyLong_FromLong(conn);
14341434
}

0 commit comments

Comments
 (0)