Commit 7fbd5c48 authored by Arnaud Blanchard's avatar Arnaud Blanchard
Browse files

Merge branch 'master' of https://git.u-cergy.fr/blaar/bapps

parents e1fd7b75 ec5d0ed4
......@@ -22,4 +22,3 @@ target_link_libraries(i_discretize_file PRIVATE blc)
......@@ -59,8 +59,7 @@ int main(int argc, char** argv){
SSCANF(1, gain_str, "%f", &gain);
channel.create_or_open(channel_name, BLC_CHANNEL_WRITE, 'FL32', 'LPCM',{static_cast<size_t>(length)});
blc_loop_try_add_posting_semaphore(channel.sem_new_data);
blc_loop_try_add_posting_semaphore(channel.sem_new_data);
blc_loop_try_add_waiting_semaphore(channel.sem_ack_data);
SYSTEM_ERROR_CHECK(file=fopen(input_filename, "r"), NULL, "Opening '%s'", input_filename);
......
......@@ -17,5 +17,3 @@ target_compile_features(i_fread PRIVATE cxx_std_14)
target_link_libraries(i_fread PRIVATE blc)
......@@ -2,7 +2,6 @@
#include "blc_text.h"
#include "blc_channel.h"
#include "blc_program.h"
#include <unistd.h>
#include <termios.h>
#include <libgen.h> //basename
......@@ -45,9 +44,7 @@ static void array_def_with_tsv_file_first_line(blc_array *array, char const *fil
}
if (time_str) length--; //The first coulmn dos not count it is the time.
array->def_array('FL32', 'NDEF', {static_cast<size_t>(length)});
fclose(file);
}
......
......@@ -12,6 +12,7 @@
cmake_minimum_required(VERSION 3.13)
project(i_keyboard)
find_package(blc REQUIRED)
add_executable(i_keyboard src/i_keyboard.cpp)
target_compile_options(i_keyboard PRIVATE -W -Wall)
......
......@@ -303,9 +303,7 @@ int main(int argc, char** argv){
if (memchr(key_list, quitting_key, keys_nb)) EXIT_ON_ERROR("The quitting key '%c' is in your key list %.*s, you need to select an other one with --quitting_key=...", quitting_key, keys_nb, key_list);
if (memchr(key_list, neutral_key, keys_nb)) EXIT_ON_ERROR("The neutral key '%c' is in your key list %.*s, you need to select an other one with --neutral_key=...", neutral_key, keys_nb, key_list);
created=channel.create_or_open(channel_name, BLC_CHANNEL_WRITE, type, 'NDEF', { static_cast<size_t>(keys_nb) });
if (filename){
extension = blc_get_filename_extension(filename);
if(strcmp(extension, "blc")==0) channel.update_with_blc_file(filename);
......
......@@ -12,4 +12,3 @@ target_link_libraries(i_oscillator PRIVATE blc)
......@@ -14,3 +14,4 @@ target_link_libraries(o_display PRIVATE blc)
......@@ -2,6 +2,7 @@
// Created by Arnaud Blanchard on 22/12/15.
// Copyright ETIS 2015. All rights reserved.
//
#include "blc_text.h"
#include "blc_channel.h"
#include "blc_program.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment