Skip to content

Commit 6eee479

Browse files
addressing some warnings
1 parent 197190e commit 6eee479

File tree

16 files changed

+27
-34
lines changed

16 files changed

+27
-34
lines changed

examples/src/ambi_bin/ambi_bin.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -752,8 +752,8 @@ int ambi_bin_getEnableTruncationEQ(void* const hAmbi)
752752
return pData->enableTruncationEQ;
753753
}
754754

755-
int ambi_bin_getNumEars()
756-
{
755+
int ambi_bin_getNumEars(void)
756+
{
757757
return NUM_EARS;
758758
}
759759

@@ -838,7 +838,7 @@ int ambi_bin_getDAWsamplerate(void* const hAmbi)
838838
return pData->fs;
839839
}
840840

841-
int ambi_bin_getProcessingDelay()
841+
int ambi_bin_getProcessingDelay(void)
842842
{
843843
return 12*HOP_SIZE;
844844
}

examples/src/ambi_dec/ambi_dec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ int ambi_dec_getNumLoudspeakers(void* const hAmbi)
906906
return pData->new_nLoudpkrs;
907907
}
908908

909-
int ambi_dec_getMaxNumLoudspeakers()
909+
int ambi_dec_getMaxNumLoudspeakers(void)
910910
{
911911
return MAX_NUM_LOUDSPEAKERS;
912912
}
@@ -994,7 +994,7 @@ int ambi_dec_getDAWsamplerate(void* const hAmbi)
994994
return pData->fs;
995995
}
996996

997-
int ambi_dec_getProcessingDelay()
997+
int ambi_dec_getProcessingDelay(void)
998998
{
999999
return 12*HOP_SIZE;
10001000
}

examples/src/ambi_drc/ambi_drc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ int ambi_drc_getSamplerate(void* const hAmbi)
422422
return (int)(pData->fs+0.5f);
423423
}
424424

425-
int ambi_drc_getProcessingDelay()
425+
int ambi_drc_getProcessingDelay(void)
426426
{
427427
return 12*HOP_SIZE;
428428
}

examples/src/ambi_enc/ambi_enc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ int ambi_enc_getNumSources(void* const hAmbi)
339339
return pData->new_nSources;
340340
}
341341

342-
int ambi_enc_getMaxNumSources()
342+
int ambi_enc_getMaxNumSources(void)
343343
{
344344
return MAX_NUM_INPUTS;
345345
}
@@ -368,7 +368,7 @@ int ambi_enc_getEnablePostScaling(void* const hAmbi)
368368
return pData->enablePostScaling;
369369
}
370370

371-
int ambi_enc_getProcessingDelay()
371+
int ambi_enc_getProcessingDelay(void)
372372
{
373373
return AMBI_ENC_FRAME_SIZE;
374374
}

examples/src/ambi_roomsim/ambi_roomsim.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ int ambi_roomsim_getNumSources(void* const hAmbi)
385385
return pData->new_nSources;
386386
}
387387

388-
int ambi_roomsim_getMaxNumSources()
388+
int ambi_roomsim_getMaxNumSources(void)
389389
{
390390
return ROOM_SIM_MAX_NUM_SOURCES;
391391
}
@@ -423,7 +423,7 @@ int ambi_roomsim_getNumReceivers(void* const hAmbi)
423423
return pData->new_nReceivers;
424424
}
425425

426-
int ambi_roomsim_getMaxNumReceivers()
426+
int ambi_roomsim_getMaxNumReceivers(void)
427427
{
428428
return ROOM_SIM_MAX_NUM_RECEIVERS;
429429
}
@@ -485,7 +485,7 @@ int ambi_roomsim_getNormType(void* const hAmbi)
485485
return (int)pData->norm;
486486
}
487487

488-
int ambi_roomsim_getProcessingDelay()
488+
int ambi_roomsim_getProcessingDelay(void)
489489
{
490490
return AMBI_ROOMSIM_FRAME_SIZE;
491491
}

examples/src/array2sh/array2sh.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ int array2sh_getSamplingRate(void* const hA2sh)
722722
return pData->fs;
723723
}
724724

725-
int array2sh_getProcessingDelay()
725+
int array2sh_getProcessingDelay(void)
726726
{
727727
return 12*HOP_SIZE;
728728
}

examples/src/beamformer/beamformer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ int beamformer_getNumBeams(void* const hBeam)
303303
return pData->nBeams;
304304
}
305305

306-
int beamformer_getMaxNumBeams()
306+
int beamformer_getMaxNumBeams(void)
307307
{
308308
return MAX_NUM_BEAMS;
309309
}
@@ -332,7 +332,7 @@ int beamformer_getBeamType(void* const hBeam)
332332
return pData->beamType;
333333
}
334334

335-
int beamformer_getProcessingDelay()
335+
int beamformer_getProcessingDelay(void)
336336
{
337337
return BEAMFORMER_FRAME_SIZE;
338338
}

examples/src/binauraliser/binauraliser.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ int binauraliser_getNumSources(void* const hBin)
518518
return pData->new_nSources;
519519
}
520520

521-
int binauraliser_getMaxNumSources()
521+
int binauraliser_getMaxNumSources(void)
522522
{
523523
return MAX_NUM_INPUTS;
524524
}
@@ -651,7 +651,7 @@ int binauraliser_getInterpMode(void* const hBin)
651651
return (int)pData->interpMode;
652652
}
653653

654-
int binauraliser_getProcessingDelay()
654+
int binauraliser_getProcessingDelay(void)
655655
{
656656
return 12*HOP_SIZE;
657657
}

examples/src/decorrelator/decorrelator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ int decorrelator_getDAWsamplerate(void* const hDecor)
330330
return pData->fs;
331331
}
332332

333-
int decorrelator_getProcessingDelay()
333+
int decorrelator_getProcessingDelay(void)
334334
{
335335
return 12*HOP_SIZE;
336336
}

examples/src/dirass/dirass.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ int dirass_getPmap(void* const hDir, float** grid_dirs, float** pmap, int* nDirs
682682
return pData->pmapReady;
683683
}
684684

685-
int dirass_getProcessingDelay()
685+
int dirass_getProcessingDelay(void)
686686
{
687687
return 2*DIRASS_FRAME_SIZE;
688688
}

examples/src/panner/panner.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ int panner_getNumSources(void* const hPan)
578578
return pData->new_nSources;
579579
}
580580

581-
int panner_getMaxNumSources()
581+
int panner_getMaxNumSources(void)
582582
{
583583
return MAX_NUM_INPUTS;
584584
}
@@ -601,7 +601,7 @@ int panner_getNumLoudspeakers(void* const hPan)
601601
return pData->new_nLoudpkrs;
602602
}
603603

604-
int panner_getMaxNumLoudspeakers()
604+
int panner_getMaxNumLoudspeakers(void)
605605
{
606606
return MAX_NUM_OUTPUTS;
607607
}
@@ -660,7 +660,7 @@ int panner_getFlipRoll(void* const hBin)
660660
return pData->bFlipRoll;
661661
}
662662

663-
int panner_getProcessingDelay()
663+
int panner_getProcessingDelay(void)
664664
{
665665
return 12*HOP_SIZE;
666666
}

examples/src/powermap/powermap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ int powermap_getPmap(void* const hPm, float** grid_dirs, float** pmap, int* nDir
743743
return pData->pmapReady;
744744
}
745745

746-
int powermap_getProcessingDelay()
746+
int powermap_getProcessingDelay(void)
747747
{
748748
return POWERMAP_FRAME_SIZE + 12*HOP_SIZE;
749749
}

examples/src/rotator/rotator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ int rotator_getNSHrequired(void* const hRot)
431431
return (pData->inputOrder+1)*(pData->inputOrder+1);
432432
}
433433

434-
int rotator_getProcessingDelay()
434+
int rotator_getProcessingDelay(void)
435435
{
436436
return ROTATOR_FRAME_SIZE;
437437
}

examples/src/sldoa/sldoa.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ int sldoa_getNormType(void* const hSld)
641641
return (int)pData->norm;
642642
}
643643

644-
int sldoa_getProcessingDelay()
644+
int sldoa_getProcessingDelay(void)
645645
{
646646
return SLDOA_FRAME_SIZE + 12*HOP_SIZE;
647647
}

examples/src/spreader/spreader.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ int spreader_getNumSources(void* const hSpr)
836836
return pData->new_nSources;
837837
}
838838

839-
int spreader_getMaxNumSources()
839+
int spreader_getMaxNumSources(void)
840840
{
841841
return SPREADER_MAX_NUM_SOURCES;
842842
}
@@ -905,7 +905,7 @@ int spreader_getDAWsamplerate(void* const hSpr)
905905
return pData->fs;
906906
}
907907

908-
int spreader_getProcessingDelay()
908+
int spreader_getProcessingDelay(void)
909909
{
910910
return 12*HOP_SIZE;
911911
}

framework/resources/convhull_3d/convhull_3d.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ void convhull_3d_build
518518
reldist[i] += pow(absdist[i*d+j], 2.0);
519519

520520
/* Sort from maximum to minimum relative distance */
521-
int num_pleft, cnt;
521+
int num_pleft;
522522
int* ind, *pleft;
523523
ind = (int*)malloc((nVert-d-1) * sizeof(int));
524524
pleft = (int*)malloc((nVert-d-1) * sizeof(int));
@@ -534,10 +534,6 @@ void convhull_3d_build
534534
occurs every #iter2del# iterations of this while loop */
535535
memset(A, 0, (d+1)*(d+1) * sizeof(CH_FLOAT));
536536

537-
/* cnt is equal to the points having been selected without deletion of
538-
nonvisible points (i.e. points inside the current convex hull) */
539-
cnt=0;
540-
541537
/* The main loop for the quickhull algorithm */
542538
CH_FLOAT detA;
543539
CH_FLOAT* points_cf, *points_s;
@@ -566,9 +562,6 @@ void convhull_3d_build
566562
else
567563
pleft = (int*)realloc(pleft, num_pleft*sizeof(int));
568564

569-
/* Update point selection counter */
570-
cnt++;
571-
572565
/* find visible faces */
573566
for(j=0; j<d; j++)
574567
points_s[j] = points[i*(d+1)+j];

0 commit comments

Comments
 (0)