Browse Source

Fix a call to yet undefined engine instance

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@4524 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.121.3
sonarnerd 14 years ago
parent
commit
d6b0d3db36
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      drivers/oss/oss_driver.c

+ 3
- 2
drivers/oss/oss_driver.c View File

@@ -367,6 +367,7 @@ static int oss_driver_attach (oss_driver_t *driver, jack_engine_t *engine)
jack_latency_range_t range; jack_latency_range_t range;


driver->engine = engine; driver->engine = engine;
set_period_size(driver, driver->period_size);


if (engine->set_buffer_size(engine, driver->period_size)) { if (engine->set_buffer_size(engine, driver->period_size)) {
jack_error ("OSS: cannot set engine buffer size to %d (check MIDI)", driver->period_size); jack_error ("OSS: cannot set engine buffer size to %d (check MIDI)", driver->period_size);
@@ -1171,6 +1172,7 @@ jack_driver_t * driver_initialize (jack_client_t *client,
__FILE__, __LINE__, errno); __FILE__, __LINE__, errno);
return NULL; return NULL;
} }
memset(driver, 0x00, sizeof(oss_driver_t));
jack_driver_init((jack_driver_t *) driver); jack_driver_init((jack_driver_t *) driver);


driver->attach = (JackDriverAttachFunction) oss_driver_attach; driver->attach = (JackDriverAttachFunction) oss_driver_attach;
@@ -1240,9 +1242,8 @@ jack_driver_t * driver_initialize (jack_client_t *client,
driver->playback_channels = playback_channels; driver->playback_channels = playback_channels;
driver->sys_in_latency = in_latency; driver->sys_in_latency = in_latency;
driver->sys_out_latency = out_latency; driver->sys_out_latency = out_latency;
/* setting driver->period_usecs & co is delayed until attach */


set_period_size(driver, period_size);
driver->finish = driver_finish; driver->finish = driver_finish;


if (driver->indev == NULL) if (driver->indev == NULL)


Loading…
Cancel
Save