diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-06-27 22:22:29 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-06-27 22:22:29 +0200 |
| commit | a99a2e2c600ee81dae8c14e09319359d2bfac9a2 (patch) | |
| tree | fc4ab3f2870b1a26450a5fe0f62a234ccc9aaaef /src | |
| parent | 45613a2ac14272c3e4779dd9aa971b5160bb060e (diff) | |
| download | fdk-aac-a99a2e2c600ee81dae8c14e09319359d2bfac9a2.tar.gz fdk-aac-a99a2e2c600ee81dae8c14e09319359d2bfac9a2.tar.bz2 fdk-aac-a99a2e2c600ee81dae8c14e09319359d2bfac9a2.zip | |
Change JackInput to char* to avoid crash when JACK compiled in but not used
Diffstat (limited to 'src')
| -rw-r--r-- | src/JackInput.cpp | 4 | ||||
| -rw-r--r-- | src/JackInput.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/JackInput.cpp b/src/JackInput.cpp index f39bf14..0d2204a 100644 --- a/src/JackInput.cpp +++ b/src/JackInput.cpp @@ -38,7 +38,7 @@ int JackInput::prepare() jack_status_t status; const char *server_name = NULL; - m_client = jack_client_open(m_jack_name.c_str(), options, &status, server_name); + m_client = jack_client_open(m_jack_name, options, &status, server_name); if (m_client == NULL) { fprintf(stderr, "jack_client_open() failed, " "status = 0x%2.0x\n", status); @@ -53,7 +53,7 @@ int JackInput::prepare() } if (status & JackNameNotUnique) { - fprintf(stderr, "JACK name '%s' not unique!\n", m_jack_name.c_str()); + fprintf(stderr, "JACK name '%s' not unique!\n", m_jack_name); return -1; } diff --git a/src/JackInput.h b/src/JackInput.h index d5832c7..36cd34f 100644 --- a/src/JackInput.h +++ b/src/JackInput.h @@ -37,7 +37,7 @@ extern "C" { class JackInput { public: - JackInput(const std::string& jack_name, + JackInput(const char* jack_name, unsigned int channels, unsigned int samplerate, SampleQueue<uint8_t>& queue) : @@ -63,7 +63,7 @@ class JackInput std::vector<jack_port_t*> m_input_ports; - std::string m_jack_name; + const char* m_jack_name; unsigned int m_channels; unsigned int m_rate; |