olaf neophyte and de.po updates, valgrind tweaks, delete green lady, inkscape dpi=96

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

diff --git a/cinelerra-5.1/cinelerra/indexable.C b/cinelerra-5.1/cinelerra/indexable.C
index fa86e313828488d74f5951cf195d4f3cba938dcc..30553a79e92177fbfba0ade776b5a34e28e3e356 100644 (file)
--- a/cinelerra-5.1/cinelerra/indexable.C
+++ b/cinelerra-5.1/cinelerra/indexable.C
@@ -2,26 +2,28 @@
 /*
  * CINELERRA
  * Copyright (C) 2009 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #include "bcsignals.h"
 #include "edl.h"
 #include "indexable.h"
+#include "language.h"
+#include "localsession.h"
 
 #include <string.h>
 
@@ -29,7 +31,7 @@ Indexable::Indexable(int is_asset) : Garbage(is_asset ? "Asset" : "EDL")
 {
        index_state = new IndexState;
        this->is_asset = is_asset;
-       strcpy(folder, MEDIA_FOLDER);
+       this->folder_no = AW_MEDIA_FOLDER;
 }
 
 
@@ -53,16 +55,17 @@ int64_t Indexable::get_audio_samples()
        return 0;
 }
 
-void Indexable::update_path(char *new_path)
+void Indexable::update_path(const char *new_path)
 {
        strcpy(path, new_path);
 }
 
 void Indexable::update_index(Indexable *src)
 {
-       index_state->remove_user();
+       if( index_state == src->index_state ) return;
+       if( index_state ) index_state->remove_user();
        index_state = src->index_state;
-       index_state->add_user();
+       if( index_state ) index_state->add_user();
 }
 
 
@@ -71,6 +74,7 @@ void Indexable::update_index(Indexable *src)
 void Indexable::copy_indexable(Indexable *src)
 {
        if( this == src ) return;
+       folder_no = src->folder_no;
        update_path(src->path);
        update_index(src);
 }
@@ -110,8 +114,11 @@ int64_t Indexable::get_video_frames()
        return 0;
 }
 
-
-
-
-
+const char *Indexable::get_title()
+{
+       if( is_asset ) return path;
+       EDL *edl = (EDL*)this;
+       if( !edl->parent_edl || folder_no == AW_PROXY_FOLDER ) return path;
+       return edl->local_session->clip_title;
+}