← Back to branch summary

~vanvugt/+junk/mediatomb

« back to all changes in this revision

Viewing changes to src/web/add_object.cc

  • Committer: Bazaar Package Importer
  • Author(s): Andres Mejia
  • Date: 2008-03-02 13:09:16 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20080302130916-zlljdze3kt7vuq4b
Tags: 0.11.0-1
* New upstream release.
* Include message about which inotify headers will be used when enabling
  inotify runtime support.
* Fixed error with use of INTERFACE in init script. Also removed use of -m
  option.
* Including new config.xml options.
* Added more build dependencies for new upstream release.
* Removed build dependency of libid3-dev, taglib is now preferred.
* mediatomb.xpm and manpage.xml is now included in orig tarball.
* inotify patch is not needed anymore.
* md5 patch has been committed upstream and is no longer needed. Also removed
  README.Debian.
* TwinHelix PNG fix is now used. Removed from TODO.
* Adding dependency of iceweasel for mediatomb package.
* Updated copyright file.
* Updated watch file.
* Updated rules file for proper configure options.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/web/add_object.cc
7
7
    Copyright (C) 2005 Gena Batyan <bgeradz@mediatomb.cc>,
8
8
                       Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>
9
9
    
10
 
    Copyright (C) 2006-2007 Gena Batyan <bgeradz@mediatomb.cc>,
 
10
    Copyright (C) 2006-2008 Gena Batyan <bgeradz@mediatomb.cc>,
11
11
                            Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>,
12
12
                            Leonhard Wimmer <leo@mediatomb.cc>
13
13
    
24
24
    version 2 along with MediaTomb; if not, write to the Free Software
25
25
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
26
26
    
27
 
    $Id: add_object.cc 1294 2007-05-13 16:28:24Z lww $
 
27
    $Id: add_object.cc 1698 2008-02-23 20:48:30Z lww $
28
28
*/
29
29
 
30
30
/// \file add_object.cc
184
184
    Ref<CdsObject> obj = nil;
185
185
    
186
186
    Ref<Element> updateContainerEl;
187
 
    
 
187
   
 
188
    bool allow_fifo = false;
 
189
 
188
190
    switch (obj_type.toInt())
189
191
    {
190
192
        case OBJECT_TYPE_CONTAINER:
199
201
            if (!string_ok(location)) throw _Exception(_("no location given"));
200
202
            if (!check_path(location, false)) throw _Exception(_("file not found"));
201
203
            obj = this->addItem(parentID, Ref<CdsItem> (new CdsItem()));
 
204
            allow_fifo = true;
202
205
            break;
203
206
            
204
207
        case OBJECT_TYPE_ITEM | OBJECT_TYPE_ACTIVE_ITEM:
207
210
            if (!check_path(location, false))
208
211
                throw _Exception(_("path not found"));
209
212
            obj = this->addActiveItem(parentID);
 
213
            allow_fifo = true;
210
214
            break;
211
215
            
212
216
        case OBJECT_TYPE_ITEM | OBJECT_TYPE_ITEM_EXTERNAL_URL:
228
232
        obj->setVirtual(true);
229
233
        if (obj_type.toInt() == OBJECT_TYPE_ITEM)
230
234
        {
231
 
            ContentManager::getInstance()->addVirtualItem(obj);
 
235
            ContentManager::getInstance()->addVirtualItem(obj, allow_fifo);
232
236
        }
233
237
        else
234
238
        {