remove v4l/lml/buz, add symbolic folders, more xlat update, yuyv fixes, v4l2 upgrades

[goodguy/history.git] / cinelerra-5.1 / cinelerra / amodule.C

diff --git a/cinelerra-5.1/cinelerra/amodule.C b/cinelerra-5.1/cinelerra/amodule.C
index 479c9204021597ae22385eeec5d630e6736a3e22..d3b1b18e99b15e24555009ef84c505f86943cd55 100644 (file)
--- a/cinelerra-5.1/cinelerra/amodule.C
+++ b/cinelerra-5.1/cinelerra/amodule.C
@@ -268,7 +268,7 @@ nested_edl);
 if(debug) printf("AModule::import_samples %d\n", __LINE__);
 
        this->channel = edit->channel;
-if(debug) printf("AModule::import_samples %d speed_fragment_len=%ld\n", 
+if(debug) printf("AModule::import_samples %d speed_fragment_len=%jd\n", 
 __LINE__,
 speed_fragment_len);
 
@@ -321,12 +321,8 @@ speed_fragment_len);
                        speed_fragment_len = (int64_t)(max_position - min_position);
                }
 
-printf("AModule::import_samples %d %f %f %f %f\n", 
-__LINE__, 
-min_position, 
-max_position,
-speed_position1,
-speed_position2);
+//printf("AModule::import_samples %d %f %f %f %f\n", 
+// __LINE__, min_position, max_position, speed_position1, speed_position2);
 
 // new start of source to read from file
                start_source = (int64_t)min_position;
@@ -389,11 +385,7 @@ if(debug) printf("AModule::import_samples %d\n", __LINE__);
                                nested_command->get_edl()->copy_all(nested_edl);
                                nested_command->change_type = CHANGE_ALL;
                                nested_command->realtime = renderengine->command->realtime;
-                               nested_renderengine = new RenderEngine(0,
-                                       get_preferences(), 
-                                       0,
-                                       renderengine ? renderengine->channeldb : 0,
-                                       1);
+                               nested_renderengine = new RenderEngine(0, get_preferences(), 0, 1);
                                nested_renderengine->set_acache(get_cache());
 // Must use a private cache for the audio
 //                             if(!cache) 
@@ -536,7 +528,7 @@ asset->sample_rate);
                        {
 
 if(debug)
-printf("AModule::import_samples %d channel=%d start_source=%ld len=%d\n", __LINE__, edit->channel, start_source, (int)speed_fragment_len);
+printf("AModule::import_samples %d channel=%d start_source=%jd len=%d\n", __LINE__, edit->channel, start_source, (int)speed_fragment_len);
                                file->set_audio_position(start_source);
                                file->set_channel(edit->channel);
                                result = file->read_samples(speed_buffer, speed_fragment_len);