← Back to branch summary

~ubuntu-branches/ubuntu/quantal/forked-daapd/quantal

« back to all changes in this revision

Viewing changes to src/raop.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien BLACHE
  • Date: 2011-04-30 11:48:15 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20110430114815-rvp6ep1k835we0l2
Tags: 0.16-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/raop.c
818
818
      goto out_query;
819
819
    }
820
820
 
821
 
  ret = dmap_encode_file_metadata(rmd->metadata, tmp, &dbmfi, NULL, 0, 1);
 
821
  ret = dmap_encode_file_metadata(rmd->metadata, tmp, &dbmfi, NULL, 0, 0, 1);
822
822
  evbuffer_free(tmp);
823
823
  if (ret < 0)
824
824
    {
2014
2014
  char *ctype;
2015
2015
  int ret;
2016
2016
 
2017
 
  ret = evbuffer_add(evbuf, EVBUFFER_DATA(rmd->artwork), EVBUFFER_LENGTH(rmd->artwork));
2018
 
  if (ret != 0)
2019
 
    {
2020
 
      DPRINTF(E_LOG, L_RAOP, "Could not copy artwork for sending\n");
2021
 
 
2022
 
      return -1;
2023
 
    }
2024
 
 
2025
2017
  switch (rmd->artwork_fmt)
2026
2018
    {
2027
2019
      case ART_FMT_PNG:
2031
2023
      case ART_FMT_JPEG:
2032
2024
        ctype = "image/jpeg";
2033
2025
        break;
 
2026
 
 
2027
      default:
 
2028
        DPRINTF(E_LOG, L_RAOP, "Unsupported artwork format %d\n", rmd->artwork_fmt);
 
2029
 
 
2030
        return -1;
 
2031
    }
 
2032
 
 
2033
  ret = evbuffer_add(evbuf, EVBUFFER_DATA(rmd->artwork), EVBUFFER_LENGTH(rmd->artwork));
 
2034
  if (ret != 0)
 
2035
    {
 
2036
      DPRINTF(E_LOG, L_RAOP, "Could not copy artwork for sending\n");
 
2037
 
 
2038
      return -1;
2034
2039
    }
2035
2040
 
2036
2041
  ret = raop_send_req_set_parameter(rs, evbuf, ctype, rtptime, raop_cb_metadata);