← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mlt++/quantal

« back to all changes in this revision

Viewing changes to src/MltPlaylist.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Fathi Boudra
  • Date: 2008-11-14 17:35:13 UTC
  • mfrom: (0.1.3 squeeze) (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20081114173513-mjqzrkgssrm0t2f8
Tags: 0.3.2-1
* New upstream release.
* Refresh patches:
  - 01_remove_ldconfig
  - 02_custom_ldflags
* Remove 03_disable_test patch. deprecated.
* Add 04_add_valerie_ldflags patch to add mlt-valerie to LDFLAGS.
* Update debian/control:
  - Add versionned build dependency to libmlt-dev.
  - Add pkg-config build dependency.
  - Bump Standards-Version to 3.8.0. No changes needed.
  - Bump libmlt++ soname. libmlt++1 conflicts/replaces libmlt++0.2.
* Update debian/copyright: add Dan Dennedy copyrights.
* Update debian/rules: remove lintian override installation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/MltPlaylist.cpp
44
44
        producer( new Producer( info->producer ) ),
45
45
        cut( new Producer( info->cut ) ),
46
46
        start( info->start ),
47
 
        resource( strdup( info->resource ) ),
 
47
        resource( info->resource? strdup( info->resource )  : 0 ),
48
48
        frame_in( info->frame_in ),
49
49
        frame_out( info->frame_out ),
50
50
        frame_count( info->frame_count ),
160
160
ClipInfo *Playlist::clip_info( int index, ClipInfo *info )
161
161
{
162
162
        mlt_playlist_clip_info clip_info;
163
 
        mlt_playlist_get_clip_info( get_playlist( ), &clip_info, index );
 
163
        if ( mlt_playlist_get_clip_info( get_playlist( ), &clip_info, index ) )
 
164
                return NULL;
164
165
        if ( info == NULL )
165
166
                return new ClipInfo( &clip_info );
166
167
        info->update( &clip_info );