X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpackagingengine.C;h=7b3336daae7c7139ee1df8c639688733ac710c4d;hb=HEAD;hp=778d4e6e9772a7510e3d9f55dc20dad1af2305bd;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/packagingengine.C b/cinelerra-5.1/cinelerra/packagingengine.C
index 778d4e6e..7b3336da 100644
--- a/cinelerra-5.1/cinelerra/packagingengine.C
+++ b/cinelerra-5.1/cinelerra/packagingengine.C
@@ -45,12 +45,9 @@ PackagingEngineDefault::~PackagingEngineDefault()
 }
 
 
-int PackagingEngineDefault::create_packages_single_farm(
-		EDL *edl,
-		Preferences *preferences,
-		Asset *default_asset,
-		double total_start,
-		double total_end)
+int PackagingEngineDefault::create_packages_single_farm(EDL *edl,
+		Preferences *preferences, Asset *default_asset,
+		double total_start, double total_end)
 {
 	this->total_start = total_start;
 	this->total_end = total_end;
@@ -62,6 +59,7 @@ int PackagingEngineDefault::create_packages_single_farm(
 	audio_end = Units::to_int64(total_end * default_asset->sample_rate);
 	video_end = Units::to_int64(total_end * default_asset->frame_rate);
 	current_package = 0;
+	current_position = 0;
 
 	double total_len = total_end - total_start;
  	total_packages = preferences->renderfarm_job_count;
@@ -70,36 +68,26 @@ int PackagingEngineDefault::create_packages_single_farm(
 	package_len = total_len / total_packages;
 	min_package_len = 2.0 / edl->session->frame_rate;
 
-
-//printf("PackageDispatcher::create_packages: %f / %d = %f\n", total_len, total_packages, package_len);
 	int current_number;    // The number being injected into the filename.
 	int number_start;      // Character in the filename path at which the number begins
 	int total_digits;      // Total number of digits including padding the user specified.
 
 	Render::get_starting_number(default_asset->path,
-		current_number,
-		number_start,
-		total_digits,
-		3);
+		current_number, number_start, total_digits, 3);
 
-	for(int i = 0; i < total_allocated; i++)
-	{
+	for( int i=0; i<total_allocated; ++i ) {
 		RenderPackage *package = packages[i] = new RenderPackage;
 
 // Create file number differently if image file sequence
-		Render::create_filename(package->path,
-			default_asset->path,
-			current_number,
-			total_digits,
-			number_start);
+		Render::create_filename(package->path, default_asset->path,
+			current_number, total_digits, number_start);
 		current_number++;
 	}
 	return 0;
 }
 
 RenderPackage* PackagingEngineDefault::get_package_single_farm(double frames_per_second,
-		int client_number,
-		int use_local_rate)
+		int client_number, int use_local_rate)
 {
 
 //printf("PackageDispatcher::get_package %ld %ld %ld %ld\n", audio_position, video_position, audio_end, video_end);
@@ -122,7 +110,7 @@ RenderPackage* PackagingEngineDefault::get_package_single_farm(double frames_per
 			{
 				result->audio_end = audio_end;
 				result->video_end = video_end;
- 				audio_position = result->audio_end;
+				audio_position = result->audio_end;
 				video_position = result->video_end;
 			}
 			else
@@ -183,33 +171,39 @@ RenderPackage* PackagingEngineDefault::get_package_single_farm(double frames_per
 
 			}
 
-			current_package++;
+                        current_package++;
 //printf("Dispatcher::get_package 50 %lld %lld %lld %lld\n",
-//result->audio_start,
-//result->video_start,
-//result->audio_end,
-//result->video_end);
-		}
-		return result;
+// result->audio_start, result->video_start, result->audio_end, result->video_end);
+                }
+                return result;
 
 }
 
 void PackagingEngineDefault::get_package_paths(ArrayList<char*> *path_list)
 {
-	for(int i = 0; i < total_allocated; i++)
-	{
+	for( int i=0; i<total_allocated; ++i ) {
 		path_list->append(strdup(packages[i]->path));
 	}
 	path_list->set_free();
 }
 
+int PackagingEngineDefault::get_asset_list(ArrayList<Indexable *> &idxbls)
+{
+	for( int i=0; i<current_package; ++i ) {
+		Asset *asset = new Asset;
+		asset->copy_from(default_asset, 1);
+		strcpy(asset->path, packages[i]->path);
+		asset->video_length = packages[i]->video_end - packages[i]->video_start;
+		asset->audio_length = packages[i]->audio_end - packages[i]->audio_start;
+		idxbls.append(asset);
+	}
+	return current_package;
+}
+
 int64_t PackagingEngineDefault::get_progress_max()
 {
-	return Units::to_int64(default_asset->sample_rate *
-			(total_end - total_start)) +
-		Units::to_int64(preferences->render_preroll *
-			2 *
-			default_asset->sample_rate);
+	return Units::to_int64(default_asset->sample_rate * (total_end - total_start)) +
+		Units::to_int64(preferences->render_preroll * 2 * default_asset->sample_rate);
 }
 
 int PackagingEngineDefault::packages_are_done()
@@ -217,6 +211,3 @@ int PackagingEngineDefault::packages_are_done()
 	return 0;
 }
 
-
-
-