Skip to content

Commit 110e656

Browse files
committed
aplay/mixer: fixed including
1 parent 13fee82 commit 110e656

File tree

1 file changed

+24
-17
lines changed

1 file changed

+24
-17
lines changed

src/audio/playback/mixer.cpp

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @author Martin Pulec <[email protected]>
44
*/
55
/*
6-
* Copyright (c) 2016-2023 CESNET z.s.p.o.
6+
* Copyright (c) 2016-2024 CESNET
77
* All rights reserved.
88
*
99
* Redistribution and use in source and binary forms, with or without
@@ -35,30 +35,37 @@
3535
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3636
*/
3737

38+
#include <algorithm> // for max, min
39+
#include <cassert> // for assert
40+
#include <chrono>
41+
#include <cmath> // for fabs, log
42+
#include <cstdint> // for int16_t, int32_t
43+
#include <cstdio> // for printf
44+
#include <cstdlib> // for free, abort
45+
#include <cstring> // for NULL, strlen, strncmp, memcpy, memset
46+
#include <iostream>
47+
#include <limits> // for numeric_limits
48+
#include <map>
49+
#include <memory> // for unique_ptr, shared_ptr
50+
#include <mutex>
51+
#include <string> // for basic_string, operator==, string
52+
#include <thread>
53+
#include <utility> // for move, pair
54+
#include <vector>
3855

39-
#ifdef HAVE_CONFIG_H
40-
#include "config.h"
41-
#include "config_unix.h"
42-
#include "config_win32.h"
43-
#endif
44-
45-
#include "audio/audio_capture.h"
4656
#include "audio/audio_playback.h"
4757
#include "audio/codec.h"
4858
#include "audio/types.h"
59+
#include "compat/net.h" // for sockaddr_in, sockaddr_in6, in6_addr
4960
#include "debug.h"
61+
#include "host.h" // for get_commandline_param, uv_argv
5062
#include "lib_common.h"
5163
#include "module.h"
5264
#include "rtp/rtp.h"
5365
#include "transmit.h"
66+
#include "types.h" // for tx_media_type
5467
#include "utils/audio_buffer.h"
5568
#include "utils/thread.h"
56-
#include <chrono>
57-
#include <iostream>
58-
#include <map>
59-
#include <mutex>
60-
#include <thread>
61-
#include <vector>
6269

6370
#define SAMPLE_RATE 48000
6471
#define BPS 2 /// @todo 4?
@@ -375,14 +382,14 @@ static void audio_play_mixer_help()
375382
"\n"
376383
"Notes:\n"
377384
"1)\tYou do not need to specify audio participants explicitly,\n"
378-
"\t" PACKAGE_NAME " simply sends the the stream back to the host\n"
385+
"\tthe mixer simply sends the the stream back to the host\n"
379386
"\tthat is sending to mixer. Therefore it is necessary that the\n"
380-
"\tparticipant uses single " PACKAGE_NAME " for both sending and\n"
387+
"\tparticipant uses single UltraGrid for both sending and\n"
381388
"\treceiving audio.\n"
382389
"2)\tUses default port for receiving, therefore if you want to use it\n"
383390
"\ton machine that is a part of the conference, you should use something like:\n"
384391
"\t\t%s -s <your_capture> -P 5004:5004:5010:5006\n"
385-
"\tfor the " PACKAGE_NAME " instance that is part of the conference (not mixer!)\n",
392+
"\tfor the UltraGrid instance that is part of the conference (not mixer!)\n",
386393
uv_argv[0], uv_argv[0]);
387394
}
388395

0 commit comments

Comments
 (0)