Attachment #506642 for bug #638646

Lines 769-775 Link Here

(-)vcdimager-0.7.24/frontends/xml/vcd_xml_rip.c (-1 / +1 lines)
769	_visit_pbc (p_pbc_ctx, n + 1, tmp, true);	769	_visit_pbc (p_pbc_ctx, n + 1, tmp, true);
770		770
771	_vcd_list_sort (p_pbc_ctx->offset_list,	771	_vcd_list_sort (p_pbc_ctx->offset_list,
772	(_cdio_list_cmp_func) vcdinf_lid_t_cmp);	772	(_cdio_list_cmp_func_t) vcdinf_lid_t_cmp);
773	}	773	}
774		774
775	static int	775	static int




  /*!
    Get the VCD info list.
  */
  CdioList_t *vcdinfo_get_offset_list(const vcdinfo_obj_t *p_vcdinfo);

  /*!
    Get the VCD info extended offset list.
  */
  CdioList_t *vcdinfo_get_offset_x_list(const vcdinfo_obj_t *p_vcdinfo);

  /*!
    Get the VCD info offset multiplier.




/* impl */

static bool
_bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func_t cmp_func)
{
  CdioListNode_t **pp_node;
  bool changed = false;

  return changed;
}

void _vcd_list_sort (CdioList_t *list, _cdio_list_cmp_func_t cmp_func)
{
  /* fixme -- this is bubble sort -- worst sorting algo... */


  vcd_assert (p_node != NULL);

  if (p_node->children)
    _vcd_list_sort (p_node->children, (_cdio_list_cmp_func_t) cmp_func);
}

void

Lines 28-34 Link Here

(-)vcdimager-0.7.24/lib/data_structures.h (-1 / +1 lines)
28		28
29	CdioListNode_t _vcd_list_at (CdioList_t list, int idx);	29	CdioListNode_t _vcd_list_at (CdioList_t list, int idx);
30		30
31	void _vcd_list_sort (CdioList_t *p_list, _cdio_list_cmp_func cmp_func);	31	void _vcd_list_sort (CdioList_t *p_list, _cdio_list_cmp_func_t cmp_func);
32		32
33	/* n-way tree */	33	/* n-way tree */
34		34




}

static 
int _dict_key_cmp_t (struct _dict_t *a, char *b)
{
  vcd_assert (a != NULL);
  vcd_assert (b != NULL);

}

static 
int _dict_sector_cmp_t (struct _dict_t *a, uint32_t *b)
{
  vcd_assert (a != NULL);
  vcd_assert (b != NULL);

  vcd_assert (key != NULL);

  node = _cdio_list_find (obj->buffer_dict_list,
			  (_cdio_list_iterfunc_t) _dict_key_cmp_t,
			  (char *) key);
  
  if (node)

  vcd_assert (sector != SECTOR_NIL);

  node = _cdio_list_find (obj->buffer_dict_list, 
			  (_cdio_list_iterfunc_t) _dict_sector_cmp_t, 
			  &sector);

  if (node)

Lines 634-640 Link Here

(-)vcdimager-0.7.24/lib/files.c (-1 / +1 lines)
634	+ (_get_scanpoint_count (p_vcdobj) * sizeof (msf_t));	634	+ (_get_scanpoint_count (p_vcdobj) * sizeof (msf_t));
635	}	635	}
636		636
637	static CdioList *	637	static CdioList_t *
638	_make_track_scantable (const VcdObj_t *p_vcdobj)	638	_make_track_scantable (const VcdObj_t *p_vcdobj)
639	{	639	{
640	CdioList_t *p_all_aps = _cdio_list_new ();	640	CdioList_t *p_all_aps = _cdio_list_new ();

Lines 88-94 Link Here

(-)vcdimager-0.7.24/lib/image_bincue.c (-2 / +2 lines)
88	}	88	}
89		89
90	static int	90	static int
91	_set_cuesheet (void user_data, const CdioList vcd_cue_list)	91	_set_cuesheet (void user_data, const CdioList_t vcd_cue_list)
92	{	92	{
93	_img_bincue_snk_t *_obj = user_data;	93	_img_bincue_snk_t *_obj = user_data;
94	CdioListNode_t *node;	94	CdioListNode_t *node;
Lines 102-108 Link Here
102		102
103	track_no = 0;	103	track_no = 0;
104	index_no = 0;	104	index_no = 0;
105	_CDIO_LIST_FOREACH (node, (CdioList *) vcd_cue_list)	105	_CDIO_LIST_FOREACH (node, (CdioList_t *) vcd_cue_list)
106	{	106	{
107	const vcd_cue_t *_cue = _cdio_list_node_data (node);	107	const vcd_cue_t *_cue = _cdio_list_node_data (node);
108	char *psz_msf;	108	char *psz_msf;

Lines 136-142 Link Here

(-)vcdimager-0.7.24/lib/info_private.c (-1 / +1 lines)
136	ret &= vcdinf_visit_pbc (obj, n + 1, tmp, true);	136	ret &= vcdinf_visit_pbc (obj, n + 1, tmp, true);
137		137
138	_vcd_list_sort (obj->extended ? obj->offset_x_list : obj->offset_list,	138	_vcd_list_sort (obj->extended ? obj->offset_x_list : obj->offset_list,
139	(_cdio_list_cmp_func) vcdinf_lid_t_cmp);	139	(_cdio_list_cmp_func_t) vcdinf_lid_t_cmp);
140		140
141	/* Now really complete the offset table with LIDs. This routine	141	/* Now really complete the offset table with LIDs. This routine
142	might obviate the need for vcdinf_visit_pbc() or some of it which is	142	might obviate the need for vcdinf_visit_pbc() or some of it which is

Lines 103-109 Link Here

(-)vcdimager-0.7.24/lib/mpeg.h (-1 / +1 lines)
103	unsigned vbvsize;	103	unsigned vbvsize;
104	bool constrained_flag;	104	bool constrained_flag;
105		105
106	CdioList aps_list; / filled up by vcd_mpeg_source */	106	CdioList_t aps_list; / filled up by vcd_mpeg_source */
107	double last_aps_pts; /* temp, see ->packet */	107	double last_aps_pts; /* temp, see ->packet */
108		108
109	} shdr[3];	109	} shdr[3];

Lines 270-276 Link Here

(-)vcdimager-0.7.24/lib/mpeg_stream.c (-2 / +2 lines)
270	}	270	}
271		271
272	static double	272	static double
273	_approx_pts (CdioList *aps_list, uint32_t packet_no)	273	_approx_pts (CdioList_t *aps_list, uint32_t packet_no)
274	{	274	{
275	double retval = 0;	275	double retval = 0;
276	CdioListNode_t *node;	276	CdioListNode_t *node;
Lines 324-330 Link Here
324		324
325	static void	325	static void
326	_fix_scan_info (struct vcd_mpeg_scan_data_t *scan_data_ptr,	326	_fix_scan_info (struct vcd_mpeg_scan_data_t *scan_data_ptr,
327	unsigned packet_no, double pts, CdioList *aps_list)	327	unsigned packet_no, double pts, CdioList_t *aps_list)
328	{	328	{
329	CdioListNode_t *node;	329	CdioListNode_t *node;
330	long _next = -1, _prev = -1, _forw = -1, _back = -1;	330	long _next = -1, _prev = -1, _forw = -1, _back = -1;




  }

  _vcd_list_sort (p_sequence->pause_list, 
                  (_cdio_list_cmp_func_t) _pause_cmp);

  vcd_debug ("added autopause point at %f", pause_time);


  }

  _vcd_list_sort (_segment->pause_list, 
                  (_cdio_list_cmp_func_t) _pause_cmp);

  vcd_debug ("added autopause point at %f", pause_time);


  }

  _vcd_list_sort (p_sequence->entry_list, 
                  (_cdio_list_cmp_func_t) _entry_cmp);

  return 0;
}

  _cdio_list_append (p_obj->custom_dir_list, _iso_pathname);

  _vcd_list_sort (p_obj->custom_dir_list, 
                  (_cdio_list_cmp_func_t) strcmp);

  return 0;
}

  /* start with meta info */

  {
    CdioList_t *p_cue_list;
    vcd_cue_t *p_cue;

    p_cue_list = _cdio_list_new ();

Return to bug 638646

Lines 455-466 Link Here

(-)vcdimager-0.7.24/include/libvcd/info.h (-2 / +2 lines)
455	/*!	455	/*!
456	Get the VCD info list.	456	Get the VCD info list.
457	*/	457	*/
458	CdioList vcdinfo_get_offset_list(const vcdinfo_obj_t p_vcdinfo);	458	CdioList_t vcdinfo_get_offset_list(const vcdinfo_obj_t p_vcdinfo);
459		459
460	/*!	460	/*!
461	Get the VCD info extended offset list.	461	Get the VCD info extended offset list.
462	*/	462	*/
463	CdioList vcdinfo_get_offset_x_list(const vcdinfo_obj_t p_vcdinfo);	463	CdioList_t vcdinfo_get_offset_x_list(const vcdinfo_obj_t p_vcdinfo);
464		464
465	/*!	465	/*!
466	Get the VCD info offset multiplier.	466	Get the VCD info offset multiplier.

Lines 583-589 Link Here

(-)vcdimager-0.7.24/lib/vcd.c (-5 / +5 lines)
583	}	583	}
584		584
585	_vcd_list_sort (p_sequence->pause_list,	585	_vcd_list_sort (p_sequence->pause_list,
586	(_cdio_list_cmp_func) _pause_cmp);	586	(_cdio_list_cmp_func_t) _pause_cmp);
587		587
588	vcd_debug ("added autopause point at %f", pause_time);	588	vcd_debug ("added autopause point at %f", pause_time);
589		589
Lines 623-629 Link Here
623	}	623	}
624		624
625	_vcd_list_sort (_segment->pause_list,	625	_vcd_list_sort (_segment->pause_list,
626	(_cdio_list_cmp_func) _pause_cmp);	626	(_cdio_list_cmp_func_t) _pause_cmp);
627		627
628	vcd_debug ("added autopause point at %f", pause_time);	628	vcd_debug ("added autopause point at %f", pause_time);
629		629
Lines 685-691 Link Here
685	}	685	}
686		686
687	_vcd_list_sort (p_sequence->entry_list,	687	_vcd_list_sort (p_sequence->entry_list,
688	(_cdio_list_cmp_func) _entry_cmp);	688	(_cdio_list_cmp_func_t) _entry_cmp);
689		689
690	return 0;	690	return 0;
691	}	691	}
Lines 1001-1007 Link Here
1001	_cdio_list_append (p_obj->custom_dir_list, _iso_pathname);	1001	_cdio_list_append (p_obj->custom_dir_list, _iso_pathname);
1002		1002
1003	_vcd_list_sort (p_obj->custom_dir_list,	1003	_vcd_list_sort (p_obj->custom_dir_list,
1004	(_cdio_list_cmp_func) strcmp);	1004	(_cdio_list_cmp_func_t) strcmp);
1005		1005
1006	return 0;	1006	return 0;
1007	}	1007	}
Lines 2290-2296 Link Here
2290	/* start with meta info */	2290	/* start with meta info */
2291		2291
2292	{	2292	{
2293	CdioList *p_cue_list;	2293	CdioList_t *p_cue_list;
2294	vcd_cue_t *p_cue;	2294	vcd_cue_t *p_cue;
2295		2295
2296	p_cue_list = _cdio_list_new ();	2296	p_cue_list = _cdio_list_new ();

Lines 58-64 Link Here

(-)vcdimager-0.7.24/lib/data_structures.c (-3 / +3 lines)
58	/* impl */	58	/* impl */
59		59
60	static bool	60	static bool
61	_bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func cmp_func)	61	_bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func_t cmp_func)
62	{	62	{
63	CdioListNode_t **pp_node;	63	CdioListNode_t **pp_node;
64	bool changed = false;	64	bool changed = false;
Lines 86-92 Link Here
86	return changed;	86	return changed;
87	}	87	}
88		88
89	void _vcd_list_sort (CdioList_t *list, _cdio_list_cmp_func cmp_func)	89	void _vcd_list_sort (CdioList_t *list, _cdio_list_cmp_func_t cmp_func)
90	{	90	{
91	/* fixme -- this is bubble sort -- worst sorting algo... */	91	/* fixme -- this is bubble sort -- worst sorting algo... */
92		92
Lines 263-269 Link Here
263	vcd_assert (p_node != NULL);	263	vcd_assert (p_node != NULL);
264		264
265	if (p_node->children)	265	if (p_node->children)
266	_vcd_list_sort (p_node->children, (_cdio_list_cmp_func) cmp_func);	266	_vcd_list_sort (p_node->children, (_cdio_list_cmp_func_t) cmp_func);
267	}	267	}
268		268
269	void	269	void

Lines 62-68 Link Here

(-)vcdimager-0.7.24/lib/dict.h (-4 / +4 lines)
62	}	62	}
63		63
64	static	64	static
65	int _dict_key_cmp (struct _dict_t a, char b)	65	int _dict_key_cmp_t (struct _dict_t a, char b)
66	{	66	{
67	vcd_assert (a != NULL);	67	vcd_assert (a != NULL);
68	vcd_assert (b != NULL);	68	vcd_assert (b != NULL);
Lines 71-77 Link Here
71	}	71	}
72		72
73	static	73	static
74	int _dict_sector_cmp (struct _dict_t a, uint32_t b)	74	int _dict_sector_cmp_t (struct _dict_t a, uint32_t b)
75	{	75	{
76	vcd_assert (a != NULL);	76	vcd_assert (a != NULL);
77	vcd_assert (b != NULL);	77	vcd_assert (b != NULL);
Lines 88-94 Link Here
88	vcd_assert (key != NULL);	88	vcd_assert (key != NULL);
89		89
90	node = _cdio_list_find (obj->buffer_dict_list,	90	node = _cdio_list_find (obj->buffer_dict_list,
91	(_cdio_list_iterfunc) _dict_key_cmp,	91	(_cdio_list_iterfunc_t) _dict_key_cmp_t,
92	(char *) key);	92	(char *) key);
93		93
94	if (node)	94	if (node)
Lines 106-112 Link Here
106	vcd_assert (sector != SECTOR_NIL);	106	vcd_assert (sector != SECTOR_NIL);
107		107
108	node = _cdio_list_find (obj->buffer_dict_list,	108	node = _cdio_list_find (obj->buffer_dict_list,
109	(_cdio_list_iterfunc) _dict_sector_cmp,	109	(_cdio_list_iterfunc_t) _dict_sector_cmp_t,
110	&sector);	110	&sector);
111		111
112	if (node)	112	if (node)