Commit 8f7d99d3 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen

Merge branch 'big_2017_api_change' into develop

parents 2a697adb 250e9c04
setup.py
MANIFEST
build
dist
examples/jupyter/*.ipynb_checkpoints*
*.wav
*.daff
This diff is collapsed.
...@@ -14,9 +14,8 @@ ...@@ -14,9 +14,8 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 2, "execution_count": null,
"metadata": { "metadata": {
"collapsed": true,
"scrolled": false "scrolled": false
}, },
"outputs": [], "outputs": [],
...@@ -37,21 +36,9 @@ ...@@ -37,21 +36,9 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 3, "execution_count": null,
"metadata": {}, "metadata": {},
"outputs": [ "outputs": [],
{
"ename": "ImportError",
"evalue": "DLL load failed: Das angegebene Modul wurde nicht gefunden.",
"output_type": "error",
"traceback": [
"\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[1;31mImportError\u001b[0m Traceback (most recent call last)",
"\u001b[1;32m<ipython-input-3-9508d0d3eded>\u001b[0m in \u001b[0;36m<module>\u001b[1;34m()\u001b[0m\n\u001b[1;32m----> 1\u001b[1;33m \u001b[1;32mimport\u001b[0m \u001b[0mva\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m",
"\u001b[1;31mImportError\u001b[0m: DLL load failed: Das angegebene Modul wurde nicht gefunden."
]
}
],
"source": [ "source": [
"import va" "import va"
] ]
...@@ -73,9 +60,7 @@ ...@@ -73,9 +60,7 @@
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
"metadata": { "metadata": {},
"collapsed": true
},
"outputs": [], "outputs": [],
"source": [ "source": [
"connection_status = va.connect()" "connection_status = va.connect()"
...@@ -91,9 +76,7 @@ ...@@ -91,9 +76,7 @@
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
"metadata": { "metadata": {},
"collapsed": true
},
"outputs": [], "outputs": [],
"source": [ "source": [
"connected = va.is_connected()\n", "connected = va.is_connected()\n",
...@@ -113,9 +96,7 @@ ...@@ -113,9 +96,7 @@
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
"metadata": { "metadata": {},
"collapsed": true
},
"outputs": [], "outputs": [],
"source": [ "source": [
"if not connected :\n", "if not connected :\n",
...@@ -125,9 +106,7 @@ ...@@ -125,9 +106,7 @@
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
"metadata": { "metadata": {},
"collapsed": true
},
"outputs": [], "outputs": [],
"source": [ "source": [
"import os\n", "import os\n",
...@@ -145,9 +124,7 @@ ...@@ -145,9 +124,7 @@
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
"metadata": { "metadata": {},
"collapsed": true
},
"outputs": [], "outputs": [],
"source": [ "source": [
"va.add_search_path( current_working_dir )" "va.add_search_path( current_working_dir )"
...@@ -156,23 +133,32 @@ ...@@ -156,23 +133,32 @@
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
"metadata": { "metadata": {},
"collapsed": true
},
"outputs": [], "outputs": [],
"source": [ "source": [
"vamods = va.enumerate_modules()\n", "vamods = va.get_modules()\n",
"print( vamods )" "print( vamods )"
] ]
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
"metadata": { "metadata": {},
"collapsed": true
},
"outputs": [], "outputs": [],
"source": [] "source": [
"hw = va.get_hardware_configuration()\n",
"print( hw )"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"core_conf = va.get_core_configuration()\n",
"print( core_conf )"
]
} }
], ],
"metadata": { "metadata": {
......
...@@ -42,16 +42,28 @@ ...@@ -42,16 +42,28 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": 2,
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [
{
"ename": "Exception",
"evalue": "Not implemented (error code 8)",
"output_type": "error",
"traceback": [
"\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[1;31mException\u001b[0m Traceback (most recent call last)",
"\u001b[1;32m<ipython-input-2-28e67d0dde0f>\u001b[0m in \u001b[0;36m<module>\u001b[1;34m()\u001b[0m\n\u001b[0;32m 8\u001b[0m description = 'Sound receivers' )\n\u001b[0;32m 9\u001b[0m \u001b[1;32mif\u001b[0m \u001b[0msound_receiver_ids\u001b[0m \u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m---> 10\u001b[1;33m \u001b[0mfirst_sound_receiver_pos\u001b[0m \u001b[1;33m=\u001b[0m \u001b[0mva\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mget_sound_receiver_position\u001b[0m\u001b[1;33m(\u001b[0m \u001b[0msound_receiver_ids\u001b[0m\u001b[1;33m[\u001b[0m \u001b[1;36m0\u001b[0m \u001b[1;33m]\u001b[0m \u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 11\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 12\u001b[0m \u001b[1;32mdef\u001b[0m \u001b[0mon_sound_receiver_update\u001b[0m\u001b[1;33m(\u001b[0m \u001b[0mw\u001b[0m \u001b[1;33m)\u001b[0m \u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n",
"\u001b[1;31mException\u001b[0m: Not implemented (error code 8)"
]
}
],
"source": [ "source": [
"sound_receiver_ids = va.get_sound_receiver_ids()\n", "sound_receiver_ids = va.get_sound_receiver_ids()\n",
"sound_receivers_dict = {}\n", "sound_receivers_dict = {}\n",
"for sound_receiver_id in sound_receiver_ids :\n", "for sound_receiver_id in sound_receiver_ids :\n",
" sound_receivers_dict.update( { va.get_sound_receiver_name( sound_receiver_id ) : sound_receiver_id } )\n", " sound_receivers_dict.update( { va.get_sound_receiver_name( sound_receiver_id ) : sound_receiver_id } )\n",
"\n", "\n",
"sound_receiver_dropdown_menu = widgets.Dropdown( \n", "sound_receivers_dropdown_menu = widgets.Dropdown( \n",
" options = sound_receivers_dict,\n", " options = sound_receivers_dict,\n",
" description = 'Sound receivers' )\n", " description = 'Sound receivers' )\n",
"if sound_receiver_ids :\n", "if sound_receiver_ids :\n",
...@@ -95,9 +107,24 @@ ...@@ -95,9 +107,24 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": 3,
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "87f1cda6f53e44bbb8eb4e0af40b3b5b",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
"A Jupyter Widget"
]
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"sound_source_ids = va.get_sound_source_ids()\n", "sound_source_ids = va.get_sound_source_ids()\n",
"sound_sources_dict = {}\n", "sound_sources_dict = {}\n",
......
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"signal_source_id = va.create_signal_source_buffer_from_file( 'Audiofiles/Bauer.wav' )\n", "signal_source_id = va.create_signal_source_buffer_from_file( '$(DemoSound)' )\n",
"va.set_signal_source_buffer_playback_action_str( signal_source_id, 'play' )\n", "va.set_signal_source_buffer_playback_action_str( signal_source_id, 'play' )\n",
"va.set_signal_source_buffer_looping( signal_source_id, True )" "va.set_signal_source_buffer_looping( signal_source_id, True )"
] ]
......
...@@ -15,8 +15,11 @@ static struct PyMethodDef va_methods[] = ...@@ -15,8 +15,11 @@ static struct PyMethodDef va_methods[] =
{ "is_connected", ( PyCFunction ) is_connected, METH_FASTCALL, no_doc }, { "is_connected", ( PyCFunction ) is_connected, METH_FASTCALL, no_doc },
{ "reset", ( PyCFunction ) reset, METH_FASTCALL, no_doc }, { "reset", ( PyCFunction ) reset, METH_FASTCALL, no_doc },
{ "get_version", ( PyCFunction ) get_version, METH_FASTCALL, no_doc },
{ "get_modules", ( PyCFunction ) get_modules, METH_FASTCALL, no_doc }, { "get_modules", ( PyCFunction ) get_modules, METH_FASTCALL, no_doc },
{ "call_module", ( PyCFunction ) call_module, METH_FASTCALL, no_doc }, { "call_module", ( PyCFunction ) call_module, METH_FASTCALL, no_doc },
{ "get_search_paths", ( PyCFunction ) get_search_paths, METH_FASTCALL, no_doc },
{ "add_search_path", ( PyCFunction ) add_search_path, METH_FASTCALL, no_doc }, { "add_search_path", ( PyCFunction ) add_search_path, METH_FASTCALL, no_doc },
{ "create_directivity_from_file", ( PyCFunction ) create_directivity_from_file, METH_FASTCALL, no_doc }, { "create_directivity_from_file", ( PyCFunction ) create_directivity_from_file, METH_FASTCALL, no_doc },
...@@ -112,17 +115,43 @@ static struct PyMethodDef va_methods[] = ...@@ -112,17 +115,43 @@ static struct PyMethodDef va_methods[] =
{ "get_sound_portal_enabled", ( PyCFunction ) get_sound_portal_enabled, METH_FASTCALL, no_doc }, { "get_sound_portal_enabled", ( PyCFunction ) get_sound_portal_enabled, METH_FASTCALL, no_doc },
{ "set_sound_portal_enabled", ( PyCFunction ) set_sound_portal_enabled, METH_FASTCALL, no_doc }, { "set_sound_portal_enabled", ( PyCFunction ) set_sound_portal_enabled, METH_FASTCALL, no_doc },
{ "get_homogeneous_medium_sound_speed", ( PyCFunction ) get_homogeneous_medium_sound_speed, METH_FASTCALL, no_doc },
{ "set_homogeneous_medium_sound_speed", ( PyCFunction ) set_homogeneous_medium_sound_speed, METH_FASTCALL, no_doc },
{ "get_homogeneous_medium_temperature", ( PyCFunction ) get_homogeneous_medium_temperature, METH_FASTCALL, no_doc },
{ "set_homogeneous_medium_temperature", ( PyCFunction ) set_homogeneous_medium_temperature, METH_FASTCALL, no_doc },
{ "get_homogeneous_medium_static_pressure", ( PyCFunction ) get_homogeneous_medium_static_pressure, METH_FASTCALL, no_doc },
{ "set_homogeneous_medium_static_pressure", ( PyCFunction ) set_homogeneous_medium_static_pressure, METH_FASTCALL, no_doc },
{ "get_homogeneous_medium_relative_humidity", ( PyCFunction ) get_homogeneous_medium_relative_humidity, METH_FASTCALL, no_doc },
{ "set_homogeneous_medium_relative_humidity", ( PyCFunction ) set_homogeneous_medium_relative_humidity, METH_FASTCALL, no_doc },
{ "get_homogeneous_medium_shift_speed", ( PyCFunction ) get_homogeneous_medium_shift_speed, METH_FASTCALL, no_doc },
{ "set_homogeneous_medium_shift_speed", ( PyCFunction ) set_homogeneous_medium_shift_speed, METH_FASTCALL, no_doc },
{ "get_homogeneous_medium_parameters", ( PyCFunction ) get_homogeneous_medium_parameters, METH_FASTCALL, no_doc },
{ "set_homogeneous_medium_parameters", ( PyCFunction ) set_homogeneous_medium_parameters, METH_FASTCALL, no_doc },
{ "create_acoustic_material", ( PyCFunction ) create_acoustic_material, METH_FASTCALL, no_doc },
{ "create_acoustic_material_from_file", ( PyCFunction ) create_acoustic_material_from_file, METH_FASTCALL, no_doc },
{ "create_acoustic_material_from_parameters", ( PyCFunction ) create_acoustic_material_from_parameters, METH_FASTCALL, no_doc },
{ "get_acoustic_material_infos", ( PyCFunction ) get_acoustic_material_infos, METH_FASTCALL, no_doc },
{ "get_rendering_modules", ( PyCFunction ) get_rendering_modules, METH_FASTCALL, no_doc }, { "get_rendering_modules", ( PyCFunction ) get_rendering_modules, METH_FASTCALL, no_doc },
{ "set_rendering_module_muted", ( PyCFunction ) set_rendering_module_muted, METH_FASTCALL, no_doc }, { "set_rendering_module_muted", ( PyCFunction ) set_rendering_module_muted, METH_FASTCALL, no_doc },
{ "get_rendering_module_muted", ( PyCFunction ) get_rendering_module_muted, METH_FASTCALL, no_doc }, { "get_rendering_module_muted", ( PyCFunction ) get_rendering_module_muted, METH_FASTCALL, no_doc },
{ "set_rendering_module_gain", ( PyCFunction ) set_rendering_module_gain, METH_FASTCALL, no_doc }, { "set_rendering_module_gain", ( PyCFunction ) set_rendering_module_gain, METH_FASTCALL, no_doc },
{ "get_rendering_module_gain", ( PyCFunction ) get_rendering_module_gain, METH_FASTCALL, no_doc }, { "get_rendering_module_gain", ( PyCFunction ) get_rendering_module_gain, METH_FASTCALL, no_doc },
{ "get_rendering_module_auralization_mode", ( PyCFunction ) get_rendering_module_auralization_mode, METH_FASTCALL, no_doc },
{ "set_rendering_module_auralization_mode", ( PyCFunction ) set_rendering_module_auralization_mode, METH_FASTCALL, no_doc },
{ "get_rendering_module_parameters", ( PyCFunction ) get_rendering_module_parameters, METH_FASTCALL, no_doc },
{ "set_rendering_module_parameters", ( PyCFunction ) set_rendering_module_parameters, METH_FASTCALL, no_doc },
{ "get_reprodution_modules", ( PyCFunction ) get_reproduction_modules, METH_FASTCALL, no_doc }, { "get_reproduction_modules", ( PyCFunction ) get_reproduction_modules, METH_FASTCALL, no_doc },
{ "set_reprodution_module_muted", ( PyCFunction ) set_reproduction_module_muted, METH_FASTCALL, no_doc }, { "set_reproduction_module_muted", ( PyCFunction ) set_reproduction_module_muted, METH_FASTCALL, no_doc },
{ "get_reprodution_module_muted", ( PyCFunction ) get_reproduction_module_muted, METH_FASTCALL, no_doc }, { "get_reproduction_module_muted", ( PyCFunction ) get_reproduction_module_muted, METH_FASTCALL, no_doc },
{ "set_reprodution_module_gain", ( PyCFunction ) set_reproduction_module_gain, METH_FASTCALL, no_doc }, { "set_reproduction_module_gain", ( PyCFunction ) set_reproduction_module_gain, METH_FASTCALL, no_doc },
{ "get_reprodution_module_gain", ( PyCFunction ) get_reproduction_module_gain, METH_FASTCALL, no_doc }, { "get_reproduction_module_gain", ( PyCFunction ) get_reproduction_module_gain, METH_FASTCALL, no_doc },
{ "get_reproduction_module_parameters", ( PyCFunction ) get_reproduction_module_parameters, METH_FASTCALL, no_doc },
{ "set_reproduction_module_parameters", ( PyCFunction ) set_reproduction_module_parameters, METH_FASTCALL, no_doc },
{ "lock_update", ( PyCFunction ) lock_update, METH_FASTCALL, no_doc }, { "lock_update", ( PyCFunction ) lock_update, METH_FASTCALL, no_doc },
...@@ -145,8 +174,13 @@ static struct PyMethodDef va_methods[] = ...@@ -145,8 +174,13 @@ static struct PyMethodDef va_methods[] =
{ "set_active_sound_receiver_explicit_renderer", ( PyCFunction ) set_active_sound_receiver_explicit_renderer, METH_FASTCALL, no_doc }, { "set_active_sound_receiver_explicit_renderer", ( PyCFunction ) set_active_sound_receiver_explicit_renderer, METH_FASTCALL, no_doc },
{ "get_core_clock", ( PyCFunction ) get_core_clock, METH_FASTCALL, no_doc }, { "get_core_clock", ( PyCFunction ) get_core_clock, METH_FASTCALL, no_doc },
{ "set_core_clock", ( PyCFunction ) set_core_clock, METH_FASTCALL, no_doc }, { "set_core_clock", ( PyCFunction ) set_core_clock, METH_FASTCALL, no_doc },
{ "substitute_macro", ( PyCFunction ) substitute_macro, METH_FASTCALL, no_doc }, { "substitute_macro", ( PyCFunction ) substitute_macro, METH_FASTCALL, no_doc },
{ "find_file_path", ( PyCFunction ) find_file_path, METH_FASTCALL, no_doc }, { "find_file_path", ( PyCFunction ) find_file_path, METH_FASTCALL, no_doc },
{ "get_core_configuration", ( PyCFunction ) get_core_configuration, METH_FASTCALL, no_doc },
{ "get_hardware_configuration", ( PyCFunction ) get_hardware_configuration, METH_FASTCALL, no_doc },
{ "get_file_list", ( PyCFunction ) get_file_list, METH_FASTCALL, no_doc },
{ "get_log_level_str", ( PyCFunction ) get_log_level_str, METH_FASTCALL, no_doc }, { "get_log_level_str", ( PyCFunction ) get_log_level_str, METH_FASTCALL, no_doc },
{ "parse_auralization_mode_str", ( PyCFunction ) parse_auralization_mode_str, METH_FASTCALL, no_doc }, { "parse_auralization_mode_str", ( PyCFunction ) parse_auralization_mode_str, METH_FASTCALL, no_doc },
{ "get_auralization_mode_str", ( PyCFunction ) get_auralization_mode_str, METH_FASTCALL, no_doc }, { "get_auralization_mode_str", ( PyCFunction ) get_auralization_mode_str, METH_FASTCALL, no_doc },
......
This diff is collapsed.
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