X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fasset.C;h=7a33a7cedcd0d5e1912c41b42d9647f7be1de093;hb=6c0c8bd0e577001d1cc18c6c27d58e62f58a6bff;hp=0128f94ee8ff499d4ea3023e7076705ad06f7d0d;hpb=3564c71f425f390745eb7c75d5121689d53e14c2;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/cinelerra/asset.C b/cinelerra-5.0/cinelerra/asset.C
index 0128f94e..7a33a7ce 100644
--- a/cinelerra-5.0/cinelerra/asset.C
+++ b/cinelerra-5.0/cinelerra/asset.C
@@ -30,7 +30,6 @@
 #include "filexml.h"
 #include "format.inc"
 #include "indexstate.h"
-#include "quicktime.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -69,7 +68,6 @@ Asset::~Asset()
 int Asset::init_values()
 {
 	path[0] = 0;
-//	format = FILE_MOV;
 // Has to be unknown for file probing to succeed
 	format = FILE_UNKNOWN;
 	fformat[0] = 0;
@@ -81,8 +79,8 @@ int Asset::init_values()
 	reset_audio();
 	reset_video();
 
-	strcpy(vcodec, QUICKTIME_YUV2);
-	strcpy(acodec, QUICKTIME_TWOS);
+	strcpy(vcodec, "");
+	strcpy(acodec, "");
 
 	ff_audio_options[0] = 0;
 	ff_video_options[0] = 0;
@@ -203,12 +201,6 @@ void Asset::boundaries()
 //printf("Asset::boundaries %d %d %f\n", __LINE__, sample_rate, frame_rate);
 }
 
-
-void Asset::reset_index()
-{
-	index_state->reset();
-}
-
 void Asset::copy_from(Asset *asset, int do_index)
 {
 	copy_location(asset);
@@ -345,31 +337,18 @@ int64_t Asset::get_index_size(int channel)
 
 char* Asset::get_compression_text(int audio, int video)
 {
-	if(audio)
-	{
-		switch(format)
-		{
-			case FILE_MOV:
-			case FILE_AVI:
-				if(acodec[0])
-					return quicktime_acodec_title(acodec);
-				else
-					return 0;
-				break;
+	if(audio) {
+		switch(format) {
+		case FILE_FFMPEG:
+			if( acodec[0] ) return acodec;
+			break;
 		}
 	}
-	else
-	if(video)
-	{
-		switch(format)
-		{
-			case FILE_MOV:
-			case FILE_AVI:
-				if(vcodec[0])
-					return quicktime_vcodec_title(vcodec);
-				else
-					return 0;
-				break;
+	if(video) {
+		switch(format) {
+		case FILE_FFMPEG:
+			if( vcodec[0] ) return vcodec;
+			break;
 		}
 	}
 	return 0;
@@ -589,11 +568,6 @@ int Asset::read_index(FileXML *file)
 	return 0;
 }
 
-int Asset::write_index(const char *path, int data_bytes)
-{
-	return index_state->write_index(path, data_bytes, this, audio_length);
-}
-
 // Output path is the path of the output file if name truncation is desired.
 // It is a "" if complete names should be used.
 
@@ -738,7 +712,6 @@ int Asset::write_index(FileXML *file)
 
 
 
-
 const char* Asset::construct_param(const char *param, 
 	const char *prefix, 
 	char *return_value)
@@ -799,7 +772,6 @@ void Asset::load_defaults(BC_Hash *defaults,
 
 
 
-// Used by filefork
 		channels = GET_DEFAULT("CHANNELS", 2);
 		if(!sample_rate) sample_rate = GET_DEFAULT("RATE", 44100);
 		header = GET_DEFAULT("HEADER", 0);
@@ -1021,7 +993,6 @@ void Asset::save_defaults(BC_Hash *defaults,
 
 
 
-// Used by filefork
 		UPDATE_DEFAULT("CHANNELS", channels);
 		UPDATE_DEFAULT("RATE", sample_rate);
 		UPDATE_DEFAULT("HEADER", header);
@@ -1049,18 +1020,6 @@ void Asset::save_defaults(BC_Hash *defaults,
 
 
 
-int Asset::update_path(char *new_path)
-{
-	strcpy(path, new_path);
-	return 0;
-}
-
-void Asset::update_index(Asset *asset)
-{
-	index_state->copy_from(asset->index_state);
-}
-
-
 int Asset::dump(FILE *fp)
 {
 	fprintf(fp,"  asset::dump\n");